From 7732aabc1ea25cf8da848d8b5193e73af67a2305 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 19 May 2019 23:29:28 +0900 Subject: Fix bug --- src/server/api/endpoints/users/groups/joined.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/api/endpoints/users/groups/joined.ts b/src/server/api/endpoints/users/groups/joined.ts index 853a2510de..97d168e527 100644 --- a/src/server/api/endpoints/users/groups/joined.ts +++ b/src/server/api/endpoints/users/groups/joined.ts @@ -32,7 +32,9 @@ export default define(meta, async (ps, me) => { const joinings = await UserGroupJoinings.find({ userId: me.id, - userGroupId: Not(In(ownedGroups.map(x => x.id))) + ...(ownedGroups.length > 0 ? { + userGroupId: Not(In(ownedGroups.map(x => x.id))) + } : {}) }); return await Promise.all(joinings.map(x => UserGroups.pack(x.userGroupId))); -- cgit v1.2.3-freya From 7e642cf70048859eef3f1c79c06946b12cd25917 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 19 May 2019 23:42:18 +0900 Subject: Fix bug --- src/server/api/endpoints/messaging/messages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts index c1e79cd130..ffd58c714e 100644 --- a/src/server/api/endpoints/messaging/messages.ts +++ b/src/server/api/endpoints/messaging/messages.ts @@ -114,7 +114,7 @@ export default define(meta, async (ps, user) => { // Mark all as read if (ps.markAsRead) { - readUserMessagingMessage(user.id, recipient.id, messages.map(x => x.id)); + readUserMessagingMessage(user.id, recipient.id, messages.filter(m => m.recipientId === user.id).map(x => x.id)); } return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, { -- cgit v1.2.3-freya