moris/mi.moris.day
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Revert "enhance: 通知が凍結も考慮するようにする"

Browse Source 
This reverts commit b1e57e571d.
This commit is contained in:
taichan 2024-02-20 14:26:18 +09:00
parent 2096caf91d
commit f0c1c08314
No known key found for this signature in database
GPG Key ID: CCE28623AFA24E9C
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/server/api/endpoints/i/notifications-grouped.ts
View File

@ -110,7 +110,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
notifications = notifications.filter(notification => !excludeTypes.includes(notification.type)); notifications = notifications.filter(notification => !excludeTypes.includes(notification.type));
} }
//#region Check muting & suspended //#region Check muting
const [ const [
userIdsWhoMeMuting, userIdsWhoMeMuting,
@ -128,12 +128,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (notifier === null) return null; if (notifier === null) return null;
if (notifier.host && userMutedInstances.has(notifier.host)) return null; if (notifier.host && userMutedInstances.has(notifier.host)) return null;
if (notifier.isSuspended) return null;
return notification; return notification;
}))).filter((notification): notification is MiNotification => notification !== null); }))).filter((notification): notification is MiNotification => notification !== null);
//#endregion Check muting & suspended //#endregion Check muting
if (notifications.length === 0) { if (notifications.length === 0) {
return []; return [];

6
packages/backend/src/server/api/endpoints/i/notifications.ts
View File

@ -108,7 +108,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
notifications = notifications.filter(notification => !excludeTypes.includes(notification.type)); notifications = notifications.filter(notification => !excludeTypes.includes(notification.type));
} }
//#region Check muting & suspended //#region Check muting
const [ const [
userIdsWhoMeMuting, userIdsWhoMeMuting,
@ -126,12 +126,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (notifier === null) return null; if (notifier === null) return null;
if (notifier.host && userMutedInstances.has(notifier.host)) return null; if (notifier.host && userMutedInstances.has(notifier.host)) return null;
if (notifier.isSuspended) return null;
return notification; return notification;
}))).filter((notification): notification is MiNotification => notification !== null); }))).filter((notification): notification is MiNotification => notification !== null);
//#endregion Check muting & suspended //#endregion Check muting
if (notifications.length === 0) { if (notifications.length === 0) {
return []; return [];