Merge branch 'dev'

Irere123 · Jan 31, 2024 · e887317 · e887317
2 parents 4bc3f50 + f45b9bb
commit e887317
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/api/src/index.ts b/api/src/index.ts
@@ -309,11 +309,14 @@ import { verify } from "jsonwebtoken";
       wsUsers[m[0].recipientId!].openChatUserId !== req.userId
     ) {
       const userIdOrder = getUserIdOrder(req.userId, m[0].recipientId!);
-      await db.update(conversationEntity).set({
-        unfriended: false,
-        ...userIdOrder,
-        [userIdOrder.userId1 === m[0].recipientId ? "read1" : "read2"]: false,
-      });
+      await db
+        .update(conversationEntity)
+        .set({
+          unfriended: false,
+          ...userIdOrder,
+          [userIdOrder.userId1 === m[0].recipientId ? "read1" : "read2"]: false,
+        })
+        .where(eq(conversationEntity.id, conversationId));
     }
 
     res.json({ message: m[0] });