set channel name to other user name if channel type is dm

targoninc · May 27, 2024 · d0e6921 · d0e6921
1 parent 55c2cfb
commit d0e6921
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/features/database/models.ts b/src/features/database/models.ts
@@ -30,8 +30,11 @@ export interface Channel {
   'bridged': boolean;
   'bridgedChannelId': Id | null;
   'bridgeInstanceId': Id | null;
+  'createdAt': Date;
   'id': Id;
   'name': string | null;
+  'type': string;
+  'updatedAt': Date;
 }
 
 export interface ImageAttachment {

diff --git a/src/features/messaging/endpoints.ts b/src/features/messaging/endpoints.ts
@@ -196,6 +196,25 @@ export class MessagingEndpoints {
             const user = req.user as User;
 
             const channels = await db.getChannelsForUser(user.id);
+            if (!channels) {
+                res.json([]);
+                return;
+            }
+            for (const channel of channels) {
+                if (channel.type === "dm") {
+                    const members = await db.getChannelMembers(channel.id);
+                    if (members) {
+                        for (const member of members) {
+                            if (member.userId !== user.id) {
+                                const targetUser = await db.getUserById(member.userId);
+                                if (targetUser) {
+                                    channel.name = targetUser.displayname ?? targetUser.username;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             res.json(channels);
         }
     }