chore: update message list query filter

aseerkt · Aug 13, 2024 · ad4d982 · ad4d982
1 parent 2a3346f
commit ad4d982
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/server/src/modules/messages/messages.controller.ts b/server/src/modules/messages/messages.controller.ts
@@ -46,19 +46,14 @@ export const listMessages: RequestHandler = async (req, res, next) => {
         cursorSelect: 'id',
         orderBy: [desc(messagesTable.id)],
         where: and(
-          groupId
-            ? and(
-                eq(messagesTable.groupId, groupId),
-                isNull(messagesTable.receiverId),
-              )
-            : undefined,
+          groupId ? eq(messagesTable.groupId, groupId) : undefined,
           partnerId
-            ? and(
-                or(
-                  eq(messagesTable.receiverId, partnerId),
+            ? or(
+                eq(messagesTable.receiverId, partnerId),
+                and(
                   eq(messagesTable.senderId, partnerId),
+                  isNull(messagesTable.groupId),
                 ),
-                isNull(messagesTable.groupId),
               )
             : undefined,
           cursor ? lt(messagesTable.id, cursor as number) : undefined,