amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse Source
This commit is contained in:
syuilo 2022-07-10 15:35:45 +09:00
commit e7f4ec72b4
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/backend/src/services/push-notification.ts
View File

@ -64,6 +64,7 @@ export async function pushNotification<T extends keyof pushNotificationsTypes>(u
type, type,
body: type === 'notification' ? truncateNotification(body as Packed<'Notification'>) : body, body: type === 'notification' ? truncateNotification(body as Packed<'Notification'>) : body,
userId, userId,
dateTime: (new Date()).getTime(),
}), { }), {
proxy: config.proxy, proxy: config.proxy,
}).catch((err: any) => { }).catch((err: any) => {

6
packages/sw/src/sw.ts
View File

@ -42,8 +42,12 @@ self.addEventListener('push', ev => {
// case 'driveFileCreated': // case 'driveFileCreated':
case 'notification': case 'notification':
case 'unreadMessagingMessage': case 'unreadMessagingMessage':
// 1日以上経過している場合は無視
if ((new Date()).getTime() - data.dateTime > 1000 * 60 * 60 * 24) break;
// クライアントがあったらストリームに接続しているということなので通知しない // クライアントがあったらストリームに接続しているということなので通知しない
if (clients.length != 0) return; if (clients.length !== 0) break;
return createNotification(data); return createNotification(data);
case 'readAllNotifications': case 'readAllNotifications':
for (const n of await self.registration.getNotifications()) { for (const n of await self.registration.getNotifications()) {

1
packages/sw/src/types.ts
View File

@ -24,6 +24,7 @@ export type pushNotificationData<K extends keyof pushNotificationDataSourceMap>
type: K; type: K;
body: pushNotificationDataSourceMap[K]; body: pushNotificationDataSourceMap[K];
userId: string; userId: string;
dateTime: number;
}; };
export type pushNotificationDataMap = { export type pushNotificationDataMap = {