graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-27 15:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: some fixes of multiple notification read (#8819)

Browse source 
* fix: limit multiple notification read

* fix

* fix
This commit is contained in:
tamaina 2022-06-12 19:28:13 +09:00 committed by GitHub
parent 3a987b0006
commit 11a6bd890c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/common/read-notification.ts
View file

@ -9,6 +9,8 @@ export async function readNotification(
userId: User['id'],
notificationIds: Notification['id'][]
) {
if (notificationIds.length === 0) return;
// Update documents
await Notifications.update({
id: In(notificationIds),

6
packages/backend/src/server/api/endpoints/notifications/read.ts
View file

@ -34,7 +34,11 @@ export const paramDef = {
{
type: 'object',
properties: {
notificationIds: { type: 'array', items: { type: 'string', format: 'misskey:id' } },
notificationIds: {
type: 'array',
items: { type: 'string', format: 'misskey:id' },
maxItems: 100,
},
},
required: ['notificationIds'],
},

12
packages/sw/src/scripts/notification-read.ts
View file

@ -37,12 +37,22 @@ class SwNotificationReadManager {
account.queue.push(data.body.id as string);
if (account.queue.length >= 20) {
if (account.timeout) clearTimeout(account.timeout);
const notificationIds = account.queue;
account.queue = [];
await api('notifications/read', data.userId, { notificationIds });
return;
}
// 最後の呼び出しから200ms待ってまとめて処理する
if (account.timeout) clearTimeout(account.timeout);
account.timeout = setTimeout(() => {
account.timeout = null;
api('notifications/read', data.userId, { notificationIds: account.queue });
const notificationIds = account.queue;
account.queue = [];
api('notifications/read', data.userId, { notificationIds });
}, 200);
}
}