v12 (#5712)

Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
Co-authored-by: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>

1 files changed, 3 insertions, 15 deletions

diff --git a/src/server/api/common/read-notification.ts b/src/server/api/common/read-notification.ts
index c8d43ba286..f686446c5c 100644
--- a/src/server/api/common/read-notification.ts
+++ b/src/server/api/common/read-notification.ts
@@ -1,8 +1,8 @@
 import { publishMainStream } from '../../../services/stream';
 import { User } from '../../../models/entities/user';
 import { Notification } from '../../../models/entities/notification';
-import { Mutings, Notifications } from '../../../models';
-import { In, Not } from 'typeorm';
+import { Notifications, Users } from '../../../models';
+import { In } from 'typeorm';
 
 /**
  * Mark notifications as read
@@ -11,11 +11,6 @@ export async function readNotification(
 	userId: User['id'],
 	notificationIds: Notification['id'][]
 ) {
-	const mute = await Mutings.find({
-		muterId: userId
-	});
-	const mutedUserIds = mute.map(m => m.muteeId);
-
 	// Update documents
 	await Notifications.update({
 		id: In(notificationIds),
@@ -24,14 +19,7 @@ export async function readNotification(
 		isRead: true
 	});
 
-	// Calc count of my unread notifications
-	const count = await Notifications.count({
-		notifieeId: userId,
-		...(mutedUserIds.length > 0 ? { notifierId: Not(In(mutedUserIds)) } : {}),
-		isRead: false
-	});
-
-	if (count === 0) {
+	if (!await Users.getHasUnreadNotification(userId)) {
 		// 全ての(いままで未読だった)通知を(これで)読みましたよというイベントを発行
 		publishMainStream(userId, 'readAllNotifications');
 	}