From fdaa894c8fa1089012d118d68361d7f4ed95b07a Mon Sep 17 00:00:00 2001
From: Shusui MOYATANI <syusui.s@gmail.com>
Date: Sat, 18 Mar 2023 16:37:29 +0900
Subject: [PATCH] feat: support CW and enhance smartphone support

---
 src/components/Column.tsx                     | 27 ++++----
 src/components/NotePostForm.tsx               | 67 ++++++++++++++++---
 .../textNote/Bech32EntityDisplay.tsx          |  0
 src/index.css                                 |  4 --
 src/nostr/useCommands.ts                      | 11 ++-
 src/pages/Home.tsx                            |  4 +-
 src/utils/imageUrl.ts                         |  4 +-
 7 files changed, 82 insertions(+), 35 deletions(-)
 delete mode 100644 src/components/textNote/Bech32EntityDisplay.tsx

diff --git a/src/components/Column.tsx b/src/components/Column.tsx
index 0c6ed2b..454f8d0 100644
--- a/src/components/Column.tsx
+++ b/src/components/Column.tsx
@@ -1,30 +1,18 @@
 import type { Component, JSX } from 'solid-js';
 import { useHandleCommand } from '@/hooks/useCommandBus';
 
-const widthToClass = {
-  widest: 'w-[500px]',
-  wide: 'w-[350px]',
-  medium: 'w-[310px]',
-  narrow: 'w-[270px]',
-} as const;
-
 type ColumnProps = {
   name: string;
   columnIndex: number;
   lastColumn?: true;
-  width: keyof typeof widthToClass | null | undefined;
+  width: 'widest' | 'wide' | 'medium' | 'narrow' | null | undefined;
   children: JSX.Element;
 };
 
 const Column: Component<ColumnProps> = (props) => {
   let columnDivRef: HTMLDivElement | undefined;
 
-  const width = () => {
-    if (props.width == null) {
-      return widthToClass.medium;
-    }
-    return widthToClass[props.width];
-  };
+  const width = () => props.width ?? 'medium';
 
   useHandleCommand(() => ({
     commandType: 'moveToColumn',
@@ -45,7 +33,16 @@ const Column: Component<ColumnProps> = (props) => {
   }));
 
   return (
-    <div ref={columnDivRef} class={`flex shrink-0 flex-col border-r ${width()}`}>
+    <div
+      ref={columnDivRef}
+      class="flex w-[80vw] shrink-0 snap-center snap-always flex-col border-r sm:snap-align-none"
+      classList={{
+        'sm:w-[500px]': width() === 'widest',
+        'sm:w-[350px]': width() === 'wide',
+        'sm:w-[310px]': width() === 'medium',
+        'sm:w-[270px]': width() === 'narrow',
+      }}
+    >
       <div class="flex h-8 shrink-0 items-center border-b bg-white px-2">
         {/* <span class="column-icon">🏠</span> */}
         <span class="column-name">{props.name}</span>
diff --git a/src/components/NotePostForm.tsx b/src/components/NotePostForm.tsx
index edccc8b..35ba85a 100644
--- a/src/components/NotePostForm.tsx
+++ b/src/components/NotePostForm.tsx
@@ -14,6 +14,8 @@ import uniq from 'lodash/uniq';
 
 import PaperAirplane from 'heroicons/24/solid/paper-airplane.svg';
 import Photo from 'heroicons/24/outline/photo.svg';
+import Eye from 'heroicons/24/solid/eye.svg';
+import EyeSlash from 'heroicons/24/outline/eye-slash.svg';
 import XMark from 'heroicons/24/outline/x-mark.svg';
 
 import UserNameDisplay from '@/components/UserDisplayName';
@@ -50,10 +52,14 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
   let fileInputRef: HTMLInputElement | undefined;
 
   const [text, setText] = createSignal<string>('');
-  const [isUploading, setIsUploading] = createSignal(false);
-  const [isDragging, setIsDragging] = createSignal(false);
+  const [contentWarning, setContentWarning] = createSignal(false);
+  const [contentWarningReason, setContentWarningReason] = createSignal('');
 
-  const clearText = () => setText('');
+  const clearText = () => {
+    setText('');
+    setContentWarningReason('');
+    setContentWarning(false);
+  };
 
   const { config } = useConfig();
   const getPubkey = usePubkey();
@@ -117,14 +123,26 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
       console.error('pubkey is not available');
       return;
     }
-    publishTextNoteMutation.mutate({
+    let textNote: Parameters<typeof commands.publishTextNote>[0] = {
       relayUrls: config().relayUrls,
       pubkey,
       content: text(),
-      notifyPubkeys: notifyPubkeys(pubkey),
-      rootEventId: replyTo()?.rootEvent()?.id ?? replyTo()?.id,
-      replyEventId: replyTo()?.id,
-    });
+    };
+    if (replyTo() != null) {
+      textNote = {
+        ...textNote,
+        notifyPubkeys: notifyPubkeys(pubkey),
+        rootEventId: replyTo()?.rootEvent()?.id ?? replyTo()?.id,
+        replyEventId: replyTo()?.id,
+      };
+    }
+    if (contentWarning()) {
+      textNote = {
+        ...textNote,
+        contentWarning: contentWarningReason(),
+      };
+    }
+    publishTextNoteMutation.mutate(textNote);
   };
 
   const handleInput: JSX.EventHandler<HTMLTextAreaElement, InputEvent> = (ev) => {
@@ -162,11 +180,11 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
 
   const handleDragOver: JSX.EventHandler<HTMLTextAreaElement, DragEvent> = (ev) => {
     ev.preventDefault();
-    setIsDragging(true);
   };
 
   const submitDisabled = () =>
     text().trim().length === 0 ||
+    (contentWarning() && contentWarningReason().length === 0) ||
     publishTextNoteMutation.isLoading ||
     uploadFilesMutation.isLoading;
 
@@ -193,6 +211,16 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
         </div>
       </Show>
       <form class="flex flex-col gap-1" onSubmit={handleSubmit}>
+        <Show when={contentWarning()}>
+          <input
+            type="text"
+            class="rounded"
+            placeholder="警告の理由"
+            maxLength={32}
+            onInput={(ev) => setContentWarningReason(ev.currentTarget.value)}
+            value={contentWarningReason()}
+          />
+        </Show>
         <textarea
           ref={(el) => {
             textAreaRef = el;
@@ -216,6 +244,23 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
               </button>
             </div>
           </Show>
+          <button
+            class="flex items-center justify-center rounded p-2 text-xs font-bold text-white hover:bg-rose-300"
+            classList={{
+              'bg-rose-300': !contentWarning(),
+              'bg-rose-400': contentWarning(),
+              'h-8': mode() === 'normal',
+              'w-8': mode() === 'normal',
+              'h-7': mode() === 'reply',
+              'w-7': mode() === 'reply',
+            }}
+            type="button"
+            area-label="コンテンツ警告を設定"
+            title="コンテンツ警告を設定"
+            onClick={() => setContentWarning((e) => !e)}
+          >
+            <span>CW</span>
+          </button>
           <button
             class="rounded bg-primary p-2 font-bold text-white"
             classList={{
@@ -227,6 +272,8 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
               'w-7': mode() === 'reply',
             }}
             type="button"
+            title="画像を投稿"
+            area-label="画像を投稿"
             disabled={fileUploadDisabled()}
             onClick={() => fileInputRef?.click()}
           >
@@ -243,6 +290,8 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
               'w-7': mode() === 'reply',
             }}
             type="submit"
+            area-label="投稿"
+            title="投稿"
             disabled={submitDisabled()}
           >
             <PaperAirplane />
diff --git a/src/components/textNote/Bech32EntityDisplay.tsx b/src/components/textNote/Bech32EntityDisplay.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/index.css b/src/index.css
index c70c365..28f59af 100644
--- a/src/index.css
+++ b/src/index.css
@@ -23,7 +23,3 @@ code {
 .link {
   @apply underline text-blue-500;
 }
-
-.h-fill-available {
-  height: -webkit-fill-available;
-}
diff --git a/src/nostr/useCommands.ts b/src/nostr/useCommands.ts
index 6902330..bcb954d 100644
--- a/src/nostr/useCommands.ts
+++ b/src/nostr/useCommands.ts
@@ -44,6 +44,7 @@ const useCommands = () => {
     pubkey,
     content,
     tags,
+    contentWarning,
     notifyPubkeys,
     rootEventId,
     mentionEventIds,
@@ -57,16 +58,22 @@ const useCommands = () => {
     rootEventId?: string;
     mentionEventIds?: string[];
     replyEventId?: string;
+    contentWarning?: string;
   }): Promise<Promise<void>[]> => {
+    // NIP-10
     const pTags = notifyPubkeys?.map((p) => ['p', p]) ?? [];
     const eTags = [];
-    // NIP-10
     if (rootEventId != null) eTags.push(['e', rootEventId, '', 'root']);
     if (mentionEventIds != null)
       mentionEventIds.forEach((id) => eTags.push(['e', id, '', 'mention']));
     if (replyEventId != null) eTags.push(['e', replyEventId, '', 'reply']);
 
-    const mergedTags = [...eTags, ...pTags, ...(tags ?? [])];
+    const additionalTags = tags != null ? [...tags] : [];
+    if (contentWarning != null && content.length > 0) {
+      additionalTags.push(['content-warning', contentWarning]);
+    }
+
+    const mergedTags = [...eTags, ...pTags, ...additionalTags];
 
     const preSignedEvent: NostrEvent = {
       kind: 1,
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index 8100665..f8606f3 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -135,9 +135,9 @@ const Home: Component = () => {
   });
 
   return (
-    <div class="flex h-screen w-screen flex-row overflow-hidden">
+    <div class="absolute inset-0 flex w-screen flex-row overflow-hidden">
       <SideBar />
-      <div class="flex h-full flex-row overflow-y-hidden overflow-x-scroll">
+      <div class="flex h-full snap-x snap-mandatory flex-row overflow-y-hidden overflow-x-scroll">
         <Column name="ホーム" columnIndex={1} width="widest">
           <Timeline events={followingsPosts()} />
         </Column>
diff --git a/src/utils/imageUrl.ts b/src/utils/imageUrl.ts
index 3cc04c8..a267600 100644
--- a/src/utils/imageUrl.ts
+++ b/src/utils/imageUrl.ts
@@ -1,7 +1,5 @@
 export const isImageUrl = (url: URL): boolean => {
-  if (url.pathname.match(/\.(jpeg|jpg|png|gif|webp)$/i)) return true;
-
-  return false;
+  return /\.(jpeg|jpg|png|gif|webp)$/i.test(url.pathname);
 };
 
 export const fixUrl = (url: URL): URL => {