feat: add replyToUserId to track which user is being replied to

- Add replyToUserId field to comments table schema
- Update POST endpoint to save the user being replied to
- Update GET endpoint to include replyToUser in response
- Update frontend to pass replyToUserId when submitting replies

This fixes the issue where replying to a reply would show @parentCommentAuthor
instead of @replyAuthor.

Co-Authored-By: Claude <[email protected]>

Author: PBnicad

client/src/page/feed.tsx

@@ -490,11 +490,13 @@ function CommentInput({
 function ReplyInput({
   feedId,
   parentId,
+  replyToUserId,
   onRefresh,
   onCancel,
 }: {
   feedId: string;
   parentId: number;
+  replyToUserId?: number;
   onRefresh: () => void;
   onCancel: () => void;
 }) {
@@ -519,7 +521,7 @@ function ReplyInput({
     client.feed
       .comment({ feed: feedId })
       .post(
-        { content, parentId },
+        { content, parentId, replyToUserId },
         {
           headers: headersWithAuth(),
         }
@@ -780,6 +782,7 @@ function CommentItem({
           <ReplyInput
             feedId={feedId}
             parentId={rootId || comment.id}
+            replyToUserId={comment.user.id}
             onRefresh={() => {
               onRefresh();
               setShowReplyInput(false);
@@ -934,6 +937,7 @@ function ReplyItem({
           <ReplyInput
             feedId={feedId}
             parentId={rootId}
+            replyToUserId={reply.user.id}
             onRefresh={() => {
               onRefresh();
               setShowReplyInput(false);

server/src/db/schema.ts

@@ -69,6 +69,7 @@ export const comments = sqliteTable("comments", {
     userId: integer("user_id").references(() => users.id, { onDelete: 'cascade' }).notNull(),
     content: text("content").notNull(),
     parentId: integer("parent_id").references(() => comments.id, { onDelete: 'cascade' }),
+    replyToUserId: integer("reply_to_user_id").references(() => users.id, { onDelete: 'set null' }),
     createdAt: created_at,
     updatedAt: updated_at,
 }) as any;
@@ -117,6 +118,10 @@ export const commentsRelations = relations(comments, ({ one, many }) => ({
         references: [comments.id],
         relationName: 'comment_replies'
     }),
+    replyToUser: one(users, {
+        fields: [comments.replyToUserId],
+        references: [users.id],
+    }),
     replies: many(comments, {
         relationName: 'comment_replies'
     }),

server/src/services/comments.ts

@@ -25,19 +25,14 @@ export function CommentService() {
                             user: {
                                 columns: { id: true, username: true, avatar: true, permission: true }
                             },
-                            parent: {
-                                columns: { id: true },
-                                with: {
-                                    user: {
-                                        columns: { id: true, username: true }
-                                    }
-                                }
+                            replyToUser: {
+                                columns: { id: true, username: true }
                             }
                         },
                         orderBy: [desc(comments.createdAt)]
                     });
 
-                    // Build nested structure with replyToUser info
+                    // Build nested structure
                     const rootComments: any[] = [];
                     const replyMap = new Map();
 
@@ -47,9 +42,6 @@ export function CommentService() {
                             if (!replyMap.has(comment.parentId)) {
                                 replyMap.set(comment.parentId, []);
                             }
-                            // Add replyToUser for replies (the user who wrote the parent comment)
-                            const parentComment = allComments.find(c => c.id === comment.parentId);
-                            (comment as any).replyToUser = parentComment?.user || null;
                             replyMap.get(comment.parentId).push(comment);
                         } else {
                             rootComments.push(comment);
@@ -66,7 +58,7 @@ export function CommentService() {
 
                     return rootComments;
                 })
-                .post('/:feed', async ({ uid, set, params: { feed }, body: { content, parentId } }) => {
+                .post('/:feed', async ({ uid, set, params: { feed }, body: { content, parentId, replyToUserId } }) => {
                     if (!uid) {
                         set.status = 401;
                         return 'Unauthorized';
@@ -88,6 +80,8 @@ export function CommentService() {
                         return 'Feed not found';
                     }
                     let finalParentId = parentId || null;
+                    let finalReplyToUserId = replyToUserId ? parseInt(replyToUserId as string) : null;
+
                     if (parentId) {
                         const parentComment = await db.query.comments.findFirst({ where: eq(comments.id, parentId) });
                         if (!parentComment || parentComment.feedId !== feedId) {
@@ -97,14 +91,22 @@ export function CommentService() {
                         // Enforce two-level nesting: if parent is already a reply, use its parent (root comment)
                         if (parentComment.parentId) {
                             finalParentId = parentComment.parentId;
+                            // If replying to a reply, use the reply's author as replyToUser
+                            if (!finalReplyToUserId) {
+                                finalReplyToUserId = parentComment.userId;
+                            }
+                        } else if (!finalReplyToUserId) {
+                            // If replying to a root comment without explicit replyToUser, use the root comment's author
+                            finalReplyToUserId = parentComment.userId;
                         }
                     }
 
                     await db.insert(comments).values({
                         feedId,
                         userId,
                         content,
-                        parentId: finalParentId
+                        parentId: finalParentId,
+                        replyToUserId: finalReplyToUserId
                     });
 
                     const webhookUrl = await ServerConfig().get(Config.webhookUrl) || env.WEBHOOK_URL;
@@ -114,7 +116,8 @@ export function CommentService() {
                 }, {
                     body: t.Object({
                         content: t.String(),
-                        parentId: t.Optional(t.Union([t.String(), t.Number()]))
+                        parentId: t.Optional(t.Union([t.String(), t.Number()])),
+                        replyToUserId: t.Optional(t.Union([t.String(), t.Number()]))
                     })
                 })
         )