Pass reference to Note OBJ when creating notifications for Poll Vote and Poll End so muted threads can be resolved correctly and do not notify if voter is silenced

This commit is contained in:
Crimekillz 2024-03-26 15:44:53 +01:00
parent 2660424429
commit fe05ceca1f
3 changed files with 4 additions and 1 deletions

View File

@ -28,6 +28,7 @@ export async function endedPollNotification(
for (const userId of userIds) { for (const userId of userIds) {
createNotification(userId, "pollEnded", { createNotification(userId, "pollEnded", {
note: note,
noteId: note.id, noteId: note.id,
}); });
} }

View File

@ -25,7 +25,7 @@ export async function createNotification(
if ( if (
data.notifierId && data.notifierId &&
["mention", "reply", "renote", "quote", "reaction", "bite"].includes(type) ["mention", "reply", "renote", "quote", "reaction", "bite", "pollVote"].includes(type)
) { ) {
const notifier = await Users.findOneBy({ id: data.notifierId }); const notifier = await Users.findOneBy({ id: data.notifierId });
// suppress if the notifier does not exist or is silenced. // suppress if the notifier does not exist or is silenced.

View File

@ -67,6 +67,7 @@ export default async function (
// Notify // Notify
createNotification(note.userId, "pollVote", { createNotification(note.userId, "pollVote", {
notifierId: user.id, notifierId: user.id,
note: note,
noteId: note.id, noteId: note.id,
choice: choice, choice: choice,
}); });
@ -79,6 +80,7 @@ export default async function (
for (const watcher of watchers) { for (const watcher of watchers) {
createNotification(watcher.userId, "pollVote", { createNotification(watcher.userId, "pollVote", {
notifierId: user.id, notifierId: user.id,
note: note,
noteId: note.id, noteId: note.id,
choice: choice, choice: choice,
}); });