Resolve #6192

3 files changed, 10 insertions, 5 deletions

diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 50586e8bc7..60a5a5e69d 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -78,7 +78,8 @@ class NotificationManager {
 
 			// 通知される側のユーザーが通知する側のユーザーをミュートしていない限りは通知する
 			if (!mentioneesMutedUserIds.includes(this.notifier.id)) {
-				createNotification(x.target, this.notifier.id, x.reason, {
+				createNotification(x.target, x.reason, {
+					notifierId: this.notifier.id,
 					noteId: this.note.id
 				});
 			}
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
index aee52ba10d..7350c813af 100644
--- a/src/services/note/polls/vote.ts
+++ b/src/services/note/polls/vote.ts
@@ -48,7 +48,8 @@ export default async function(user: User, note: Note, choice: number) {
 	});
 
 	// Notify
-	createNotification(note.userId, user.id, 'pollVote', {
+	createNotification(note.userId, 'pollVote', {
+		notifierId: user.id,
 		noteId: note.id,
 		choice: choice
 	});
@@ -60,7 +61,8 @@ export default async function(user: User, note: Note, choice: number) {
 	})
 	.then(watchers => {
 		for (const watcher of watchers) {
-			createNotification(watcher.userId, user.id, 'pollVote', {
+			createNotification(watcher.userId, 'pollVote', {
+				notifierId: user.id,
 				noteId: note.id,
 				choice: choice
 			});
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index 166c4e1f81..72750affe0 100644
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@@ -66,7 +66,8 @@ export default async (user: User, note: Note, reaction?: string) => {
 
 	// リアクションされたユーザーがローカルユーザーなら通知を作成
 	if (note.userHost === null) {
-		createNotification(note.userId, user.id, 'reaction', {
+		createNotification(note.userId, 'reaction', {
+			notifierId: user.id,
 			noteId: note.id,
 			reaction: reaction
 		});
@@ -78,7 +79,8 @@ export default async (user: User, note: Note, reaction?: string) => {
 		userId: Not(user.id)
 	}).then(watchers => {
 		for (const watcher of watchers) {
-			createNotification(watcher.userId, user.id, 'reaction', {
+			createNotification(watcher.userId, 'reaction', {
+				notifierId: user.id,
 				noteId: note.id,
 				reaction: reaction
 			});