1
0
mirror of https://github.com/hotomoe/hotomoe synced 2024-12-05 10:18:09 +09:00

Merge branch 'develop'

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

View File

@ -54,6 +54,12 @@ mongodb:
8. master ブランチに戻す
9. enjoy
11.17.1 (2019/05/20)
--------------------
### 🐛Fixes
* トークの通知インジケーターが点灯し続ける問題を修正
* ユーザーグループの読み込みでエラーになることがある問題を修正
11.17.0 (2019/05/19)
--------------------
### 注意

View File

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"version": "11.17.0",
"version": "11.17.1",
"codename": "daybreak",
"repository": {
"type": "git",

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

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