profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
syuilo 2019-05-20 00:12:42 +09:00
commit 786521eba7
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/api/endpoints/messaging/messages.ts
View file

@ -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, {

4
src/server/api/endpoints/users/groups/joined.ts
View file

@ -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)));