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

misskey-dev · Feb 19, 2024 · b1e57e5 · b1e57e5
1 parent 35609b4
commit b1e57e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts b/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts
@@ -110,7 +110,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				notifications = notifications.filter(notification => !excludeTypes.includes(notification.type));
 			}
 
-			//#region Check muting
+			//#region Check muting & suspended
 
 			const [
 				userIdsWhoMeMuting,
@@ -128,10 +128,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				if (notifier === null) return null;
 				if (notifier.host && userMutedInstances.has(notifier.host)) return null;
 
+				if (notifier.isSuspended) return null;
+
 				return notification;
 			}))).filter((notification): notification is MiNotification => notification !== null);
 
-			//#endregion Check muting
+			//#endregion Check muting & suspended
 
 			if (notifications.length === 0) {
 				return [];

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