From 04a966f025812dfb1aa1955fd73ca9edf8ff9670 Mon Sep 17 00:00:00 2001
From: aster <137767097+aster-void@users.noreply.github.com>
Date: Sat, 20 Sep 2025 18:08:54 +0900
Subject: [PATCH 1/3] always use username for posting

---
 .../src/components/chat/MessageInput.svelte   | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/components/chat/MessageInput.svelte b/packages/client/src/components/chat/MessageInput.svelte
index 46a0041..97e5145 100644
--- a/packages/client/src/components/chat/MessageInput.svelte
+++ b/packages/client/src/components/chat/MessageInput.svelte
@@ -21,15 +21,18 @@
   const identity = useQuery(api.users.me, {});
 
   let messageContent = $state("");
-  let authorName = $state("");
   let showEmojiPalette = $state(false);
   let showFileSelector = $state(false);
   let attachedFiles = $state<File[]>([]);
 
-  $effect(() => {
-    if (identity?.data && !authorName) {
-      authorName = identity.data.name ?? identity.data.email ?? "匿名";
-    }
+  const clickable = $derived.by<boolean>(() => {
+    // empty content
+    if (!messageContent.trim() && attachedFiles.length === 0) return false;
+    // post ongoing
+    if (sendMessageMutation.processing) return false;
+    // identity not loaded yet
+    if (!identity.data) return false;
+    return true;
   });
 
   const uploader = new FileUploader(() => ({
@@ -38,6 +41,7 @@
 
   async function sendMessage() {
     if (!messageContent.trim() && attachedFiles.length === 0) return;
+    if (!identity.data) return;
 
     const attachments = (await uploader.uploadAll(attachedFiles)).map(
       (it) => it.id,
@@ -46,7 +50,7 @@
     await sendMessageMutation.run({
       channelId,
       content: messageContent.trim() || "",
-      author: authorName.trim() || "匿名",
+      author: identity.data.name,
       parentId: replyingTo?._id ?? undefined,
       attachments,
     });
@@ -116,14 +120,7 @@
     />
   {/if}
 
-  <div class="flex gap-2">
-    <input
-      type="text"
-      placeholder="ユーザー名"
-      class="input input-sm input-bordered w-32"
-      bind:value={authorName}
-    />
-  </div>
+  <div class="flex gap-2"></div>
 
   <div class="flex gap-2">
     <div class="flex-1 space-y-2">
@@ -164,8 +161,7 @@
     <button
       class="btn btn-primary self-end"
       onclick={sendMessage}
-      disabled={(!messageContent.trim() && attachedFiles.length === 0) ||
-        sendMessageMutation.processing}
+      disabled={clickable}
     >
       {#if sendMessageMutation.processing}
         <span class="loading loading-spinner loading-sm"></span>

From a8f217a6207b30207d8002f27fb3f1a89620ad1d Mon Sep 17 00:00:00 2001
From: aster <137767097+aster-void@users.noreply.github.com>
Date: Sun, 5 Oct 2025 10:45:46 +0900
Subject: [PATCH 2/3] some refinements

---
 .../src/components/channels/Channel.svelte    |  3 +-
 .../src/components/chat/MessageInput.svelte   | 45 +++++++++----------
 .../src/components/chat/MessageList.svelte    |  3 +-
 packages/client/src/icons/attachment.svelte   |  8 ++++
 packages/convex/index.ts                      |  4 +-
 5 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 packages/client/src/icons/attachment.svelte

diff --git a/packages/client/src/components/channels/Channel.svelte b/packages/client/src/components/channels/Channel.svelte
index 9bb37ad..a96e82b 100644
--- a/packages/client/src/components/channels/Channel.svelte
+++ b/packages/client/src/components/channels/Channel.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-  import { api, type Id } from "@packages/convex";
-  import type { Doc } from "@packages/convex/src/convex/_generated/dataModel";
+  import { api, type Id, type Doc } from "@packages/convex";
   import { useQuery } from "convex-svelte";
   import MessageInput from "../chat/MessageInput.svelte";
   import MessageList from "../chat/MessageList.svelte";
diff --git a/packages/client/src/components/chat/MessageInput.svelte b/packages/client/src/components/chat/MessageInput.svelte
index a597045..9d1b9a4 100644
--- a/packages/client/src/components/chat/MessageInput.svelte
+++ b/packages/client/src/components/chat/MessageInput.svelte
@@ -1,12 +1,15 @@
 <script lang="ts">
-  import { api, type Id } from "@packages/convex";
-  import type { Doc } from "@packages/convex/src/convex/_generated/dataModel";
+  import { api, type Id, type Doc } from "@packages/convex";
   import { useConvexClient, useQuery } from "convex-svelte";
+
+  import { useMutation } from "~/lib/useMutation.svelte.ts";
+  import MdiClose from "~/icons/mdi-close.svelte";
+  import Attachment from "~/icons/attachment.svelte";
+
   import FilePreview from "~/features/files/upload/FilePreview.svelte";
   import FileSelector from "~/features/files/upload/Selector.svelte";
   import { FileUploader } from "~/features/files/upload/uploader.svelte";
-  import MdiClose from "~/icons/mdi-close.svelte";
-  import { useMutation } from "~/lib/useMutation.svelte.ts";
+
   import EmojiPalette from "./EmojiPalette.svelte";
   import VoteMaker from "./VoteMaker.svelte";
 
@@ -38,12 +41,13 @@
   let attachedFiles = $state<File[]>([]);
 
   const clickable = $derived.by<boolean>(() => {
-    // empty content
-    if (!messageContent.trim() && attachedFiles.length === 0) return false;
     // post ongoing
     if (sendMessageMutation.processing) return false;
     // identity not loaded yet
     if (!identity.data) return false;
+    // empty content
+    if (!messageContent.trim() && attachedFiles.length === 0 && !voteIsValid())
+      return false;
     return true;
   });
 
@@ -54,16 +58,19 @@
     voteOptions: [],
     voters: [],
   });
+  function voteIsValid() {
+    if (!vote.title.trim()) return false;
+    if (vote.voteOptions.length === 0) return false;
+    if (vote.maxVotes === 0) return false;
+    return true;
+  }
 
-  const personalization = useQuery(api.personalization.getPersonalization, {
-    organizationId: organizationId,
-  });
   const uploader = new FileUploader(() => ({
     organizationId,
   }));
 
   async function sendMessage() {
-    if (!messageContent.trim() && attachedFiles.length === 0) return;
+    if (!clickable) return;
     if (!identity.data) return;
 
     const attachments = (await uploader.uploadAll(attachedFiles)).map(
@@ -71,7 +78,7 @@
     );
 
     let voteId: Id<"votes"> | undefined;
-    if (vote.title.trim() && vote.voteOptions.length !== 0) {
+    if (voteIsValid()) {
       voteId = await convex.mutation(api.vote.addVote, {
         title: vote.title,
         maxVotes: vote.maxVotes,
@@ -186,19 +193,7 @@
           title="ファイルを添付"
           type="button"
         >
-          <svg
-            class="h-4 w-4"
-            fill="none"
-            stroke="currentColor"
-            viewBox="0 0 24 24"
-          >
-            <path
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              stroke-width="2"
-              d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13"
-            ></path>
-          </svg>
+          <Attachment />
           {showFileSelector ? "キャンセル" : "ファイル添付"}
         </button>
         <button
@@ -215,7 +210,7 @@
     <button
       class="btn btn-primary self-end"
       onclick={sendMessage}
-      disabled={clickable}
+      disabled={!clickable}
     >
       {#if sendMessageMutation.processing}
         <span class="loading loading-spinner loading-sm"></span>
diff --git a/packages/client/src/components/chat/MessageList.svelte b/packages/client/src/components/chat/MessageList.svelte
index 7811e9d..c48c6b2 100644
--- a/packages/client/src/components/chat/MessageList.svelte
+++ b/packages/client/src/components/chat/MessageList.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-  import { api, type Id } from "@packages/convex";
-  import type { Doc } from "@packages/convex/src/convex/_generated/dataModel";
+  import { api, type Id, type Doc } from "@packages/convex";
   import { useQuery } from "convex-svelte";
   import { onMount } from "svelte";
   import Modal, { ModalManager } from "$lib/modal/modal.svelte";
diff --git a/packages/client/src/icons/attachment.svelte b/packages/client/src/icons/attachment.svelte
new file mode 100644
index 0000000..41fbe89
--- /dev/null
+++ b/packages/client/src/icons/attachment.svelte
@@ -0,0 +1,8 @@
+<svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+  <path
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    stroke-width="2"
+    d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13"
+  ></path>
+</svg>
diff --git a/packages/convex/index.ts b/packages/convex/index.ts
index 2365bef..ca306db 100644
--- a/packages/convex/index.ts
+++ b/packages/convex/index.ts
@@ -1,7 +1,7 @@
 export { api } from "./src/convex/_generated/api";
-export type { Id } from "./src/convex/_generated/dataModel";
+export type { Id, Doc } from "./src/convex/_generated/dataModel";
 
-import type { DataModel } from "./src/convex/_generated/dataModel";
+import type { DataModel, } from "./src/convex/_generated/dataModel";
 export type Task = DataModel["tasks"]["document"];
 
 export type Query<T> =

From 13994a724b0f1a248e33bd929a46715c242b2260 Mon Sep 17 00:00:00 2001
From: aster <137767097+aster-void@users.noreply.github.com>
Date: Sun, 5 Oct 2025 10:46:41 +0900
Subject: [PATCH 3/3] run autofix

---
 packages/client/src/components/channels/Channel.svelte |  2 +-
 .../client/src/components/chat/MessageInput.svelte     | 10 ++++------
 packages/client/src/components/chat/MessageList.svelte |  2 +-
 packages/convex/index.ts                               |  4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/channels/Channel.svelte b/packages/client/src/components/channels/Channel.svelte
index a96e82b..b7da186 100644
--- a/packages/client/src/components/channels/Channel.svelte
+++ b/packages/client/src/components/channels/Channel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { api, type Id, type Doc } from "@packages/convex";
+  import { api, type Doc, type Id } from "@packages/convex";
   import { useQuery } from "convex-svelte";
   import MessageInput from "../chat/MessageInput.svelte";
   import MessageList from "../chat/MessageList.svelte";
diff --git a/packages/client/src/components/chat/MessageInput.svelte b/packages/client/src/components/chat/MessageInput.svelte
index 9d1b9a4..5107a20 100644
--- a/packages/client/src/components/chat/MessageInput.svelte
+++ b/packages/client/src/components/chat/MessageInput.svelte
@@ -1,14 +1,12 @@
 <script lang="ts">
-  import { api, type Id, type Doc } from "@packages/convex";
+  import { api, type Doc, type Id } from "@packages/convex";
   import { useConvexClient, useQuery } from "convex-svelte";
-
-  import { useMutation } from "~/lib/useMutation.svelte.ts";
-  import MdiClose from "~/icons/mdi-close.svelte";
-  import Attachment from "~/icons/attachment.svelte";
-
   import FilePreview from "~/features/files/upload/FilePreview.svelte";
   import FileSelector from "~/features/files/upload/Selector.svelte";
   import { FileUploader } from "~/features/files/upload/uploader.svelte";
+  import Attachment from "~/icons/attachment.svelte";
+  import MdiClose from "~/icons/mdi-close.svelte";
+  import { useMutation } from "~/lib/useMutation.svelte.ts";
 
   import EmojiPalette from "./EmojiPalette.svelte";
   import VoteMaker from "./VoteMaker.svelte";
diff --git a/packages/client/src/components/chat/MessageList.svelte b/packages/client/src/components/chat/MessageList.svelte
index c48c6b2..e92520f 100644
--- a/packages/client/src/components/chat/MessageList.svelte
+++ b/packages/client/src/components/chat/MessageList.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { api, type Id, type Doc } from "@packages/convex";
+  import { api, type Doc, type Id } from "@packages/convex";
   import { useQuery } from "convex-svelte";
   import { onMount } from "svelte";
   import Modal, { ModalManager } from "$lib/modal/modal.svelte";
diff --git a/packages/convex/index.ts b/packages/convex/index.ts
index ca306db..09cda48 100644
--- a/packages/convex/index.ts
+++ b/packages/convex/index.ts
@@ -1,7 +1,7 @@
 export { api } from "./src/convex/_generated/api";
-export type { Id, Doc } from "./src/convex/_generated/dataModel";
+export type { Doc, Id } from "./src/convex/_generated/dataModel";
 
-import type { DataModel, } from "./src/convex/_generated/dataModel";
+import type { DataModel } from "./src/convex/_generated/dataModel";
 export type Task = DataModel["tasks"]["document"];
 
 export type Query<T> =