MatchingStatusSchemaを追加

Author: KaichiManabe

common/zod/schemas.ts

@@ -123,9 +123,15 @@ export const SendMessageSchema = z.object({
   content: z.string().min(1, { message: "Content must not be empty." }),
 });
 
+export const MatchingStatusSchema = z.union([
+  z.literal("myRequest"),
+  z.literal("otherRequest"),
+  z.literal("matched"),
+]);
+
 export const DMOverviewSchema = z.object({
   isDM: z.literal(true),
-  isFriend: z.boolean(),
+  matchingStatus: MatchingStatusSchema,
   friendId: UserIDSchema,
   name: NameSchema,
   thumbnail: z.string(),
@@ -154,7 +160,7 @@ export const DMRoomSchema = z.object({
 export const PersonalizedDMRoomSchema = z.object({
   name: NameSchema,
   thumbnail: z.string(),
-  isFriend: z.boolean(),
+  matchingStatus: MatchingStatusSchema,
 });
 
 export const SharedRoomSchema = z.object({

server/src/functions/chat.ts

@@ -77,7 +77,12 @@ export async function getDM(
   const personalized: PersonalizedDMRoom & DMRoom = {
     name: friendData.value.name,
     thumbnail: friendData.value.pictureUrl,
-    isFriend: rel.value.status === "MATCHED",
+    matchingStatus:
+      rel.value.status === "MATCHED"
+        ? "matched"
+        : rel.value.status === "PENDING"
+          ? "myRequest"
+          : "otherRequest", //Fix Me: これだとREJECTEDの時に、matchingStatus = otherRequest になってしまう。本当はちゃんと判別しないといけない。呼び出し口でこれがちゃんと使われてないので、無視している。
     ...room.value,
   };
 

server/src/router/chat.ts

@@ -23,12 +23,12 @@ router.get("/overview", async (req, res) => {
   res.status(result.code).send(result.body);
 });
 
-// send DM to userid.
+// send DM to userId.
 router.post("/dm/to/:userid", async (req, res) => {
   const user = await safeGetUserId(req);
   if (!user.ok) return res.status(401).send("auth error");
   const friend = safeParseInt(req.params.userid);
-  if (!friend.ok) return res.status(400).send("bad param encoding: `userid`");
+  if (!friend.ok) return res.status(400).send("bad param encoding: `userId`");
 
   const send = SendMessageSchema.safeParse(req.body);
   if (!send.success) {
@@ -42,14 +42,14 @@ router.post("/dm/to/:userid", async (req, res) => {
   res.status(result.code).send(result.body);
 });
 
-// GET a DM Room with userid, CREATE one if not found.
+// GET a DM Room with userId, CREATE one if not found.
 router.get("/dm/with/:userid", async (req, res) => {
   const user = await safeGetUserId(req);
   if (!user.ok) return res.status(401).send("auth error");
 
   const friend = safeParseInt(req.params.userid);
   if (!friend.ok)
-    return res.status(400).send("invalid param `userid` formatting");
+    return res.status(400).send("invalid param `userId` formatting");
 
   const result = await core.getDM(user.value, friend.value);
 

web/components/human/humanListItem.tsx

@@ -7,6 +7,7 @@ type HumanListItemProps = {
   pictureUrl: string;
   lastMessage?: string;
   rollUpName?: boolean; // is currently only intended to be used in Chat
+  statusMessage?: string;
   onDelete?: (id: number) => void;
   onOpen?: (user: { id: number; name: string; pictureUrl: string }) => void;
   onAccept?: (id: number) => void;
@@ -23,6 +24,7 @@ export function HumanListItem(props: HumanListItemProps) {
     pictureUrl,
     rollUpName,
     lastMessage,
+    statusMessage,
     onDelete,
     onOpen,
     onAccept,
@@ -61,6 +63,9 @@ export function HumanListItem(props: HumanListItemProps) {
               {lastMessage}
             </span>
           )}
+          {statusMessage && (
+            <span className="text-blue-500 text-sm">{statusMessage}</span>
+          )}
         </div>
       </button>
       <div className="flex items-center space-x-2">