指摘された点を修正

Author: KaichiManabe

server/src/database/chat.ts

@@ -66,19 +66,24 @@ export async function getOverview(
     });
 
     // リクエスター (友達申請者) のオーバービュー作成
-    const requesterOverview = requester.value.map((requester) => {
-      const overview: DMOverview = {
-        isDM: true,
-        isFriend: false,
-        friendId: requester.id,
-        name: requester.name,
-        thumbnail: requester.pictureUrl,
-        lastMsg: undefined, // リクエストには最後のメッセージはない
-      };
-      return overview;
-    });
+    const requesterOverview = await Promise.all(
+      requester.value.map(async (requester) => {
+        const lastMessageResult = await getLastMessage(user, requester.id);
+        const lastMessage = lastMessageResult.ok
+          ? lastMessageResult.value
+          : undefined;
+        const overview: DMOverview = {
+          isDM: true,
+          isFriend: false,
+          friendId: requester.id,
+          name: requester.name,
+          thumbnail: requester.pictureUrl,
+          lastMsg: lastMessage,
+        };
+        return overview;
+      }),
+    );
 
-    // すべてのオーバービューを結合
     return Ok([...shared, ...dm, ...requesterOverview]);
   } catch (e) {
     return Err(e);

server/src/functions/chat.ts

@@ -43,7 +43,9 @@ export async function sendDM(
 ): Promise<http.Response<Message>> {
   const rel = await getRelation(from, to);
   if (!rel.ok || rel.value.status === "REJECTED")
-    return http.forbidden("cannot send to rejected-friend");
+    return http.forbidden(
+      "You cannot send a message because the friendship request was rejected.",
+    );
 
   // they are now MATCHED
   const msg: Omit<Message, "id"> = {