wip

packages/backend/src/core/NoteCreateService.ts

@@ -100,17 +100,14 @@ class NotificationManager {
 	}
 
 	@bindThis
-	public async deliver() {
+	public async notify() {
 		for (const x of this.queue) {
-			// ミュート情報を取得
+			if (x.reason === 'renote') {
-			const mentioneeMutes = await this.mutingsRepository.findBy({
+				this.notificationService.createNotification(x.target, 'renote', {
-				muterId: x.target,
+					noteId: this.note.id,
-			});
+					targetNoteId: this.note.renoteId!,
-
+				}, this.notifier.id);
-			const mentioneesMutedUserIds = mentioneeMutes.map(m => m.muteeId);
+			} else {
-
-			// 通知される側のユーザーが通知する側のユーザーをミュートしていない限りは通知する
-			if (!mentioneesMutedUserIds.includes(this.notifier.id)) {
 				this.notificationService.createNotification(x.target, x.reason, {
 					noteId: this.note.id,
 				}, this.notifier.id);
@@ -642,7 +639,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 				}
 			}
 
-			nm.deliver();
+			nm.notify();
 
 			//#region AP deliver
 			if (this.userEntityService.isLocalUser(user)) {

packages/backend/src/models/Notification.ts

@@ -38,6 +38,7 @@ export type MiNotification = {
 	createdAt: string;
 	notifierId: MiUser['id'];
 	noteId: MiNote['id'];
+	targetNoteId: MiNote['id'];
 } | {
 	type: 'quote';
 	id: string;

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

@@ -142,15 +142,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					prevGroupedNotification.id = notification.id;
 					continue;
 				}
-				if (prev.type === 'renote' && notification.type === 'renote' && prev.noteId === notification.noteId) {
+				if (prev.type === 'renote' && notification.type === 'renote' && prev.targetNoteId === notification.targetNoteId) {
 					if (prevGroupedNotification.type !== 'renote:grouped') {
-						groupedNotifications.push({
+						groupedNotifications[groupedNotifications.length - 1] = {
 							type: 'renote:grouped',
 							id: '',
 							createdAt: notification.createdAt,
 							noteId: prev.noteId!,
 							userIds: [],
-						});
+						};
 						prevGroupedNotification = groupedNotifications.at(-1)!;
 					}
 					(prevGroupedNotification as FilterUnionByProperty<MiGroupedNotification, 'type', 'renote:grouped'>).userIds.push(notification.notifierId!);