diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-05-20 00:12:42 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-05-20 00:12:42 +0900 |
| commit | 786521eba79179f514bb87ea5a0d2c4eb45af551 (patch) | |
| tree | 7403178527eaaea22624d9d8096410bbc414d442 /src/server/api | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.17.1 (diff) | |
| download | misskey-786521eba79179f514bb87ea5a0d2c4eb45af551.tar.gz misskey-786521eba79179f514bb87ea5a0d2c4eb45af551.tar.bz2 misskey-786521eba79179f514bb87ea5a0d2c4eb45af551.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints/messaging/messages.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/groups/joined.ts | 4 |
2 files changed, 4 insertions, 2 deletions
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, { 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))); |