Merge branch 'develop' into sw-notification-action

This commit is contained in:
tamaina
2021-07-13 22:17:26 +09:00
14 changed files with 266 additions and 135 deletions

View File

@@ -7,6 +7,7 @@ import { Channel } from '../../models/entities/channel';
import { checkHitAntenna } from '@/misc/check-hit-antenna';
import { getAntennas } from '@/misc/antenna-cache';
import { PackedNote } from '../../models/repositories/note';
import { readNotificationByQuery } from '@/server/api/common/read-notification';
/**
* Mark notes as read
@@ -96,6 +97,10 @@ export default async function(
publishMainStream(userId, 'readAllChannels');
}
});
readNotificationByQuery(userId, {
noteId: In([...readMentions.map(n => n.id), ...readSpecifiedNotes.map(n => n.id)]),
});
}
if (readAntennaNotes.length > 0) {