From 7732aabc1ea25cf8da848d8b5193e73af67a2305 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 19 May 2019 23:29:28 +0900 Subject: [PATCH 1/3] Fix bug --- src/server/api/endpoints/users/groups/joined.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/api/endpoints/users/groups/joined.ts b/src/server/api/endpoints/users/groups/joined.ts index 853a2510d..97d168e52 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))); From 7e642cf70048859eef3f1c79c06946b12cd25917 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 19 May 2019 23:42:18 +0900 Subject: [PATCH 2/3] Fix bug --- src/server/api/endpoints/messaging/messages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts index c1e79cd13..ffd58c714 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, { From 202cb3048a4230bd6d5c0024962d8da039c69507 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 20 May 2019 00:12:19 +0900 Subject: [PATCH 3/3] 11.17.1 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1479b77a..d7de34f59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,12 @@ mongodb: 8. master ブランチに戻す 9. enjoy +11.17.1 (2019/05/20) +-------------------- +### 🐛Fixes +* トークの通知インジケーターが点灯し続ける問題を修正 +* ユーザーグループの読み込みでエラーになることがある問題を修正 + 11.17.0 (2019/05/19) -------------------- ### 注意 diff --git a/package.json b/package.json index ff25d7756..4d3b59388 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "11.17.0", + "version": "11.17.1", "codename": "daybreak", "repository": { "type": "git",