feat(notif): prevent manage-request users receiving auto-approve notif from their requests (#1707) (#1709)

Email and webpush agents will filter out these users. Discord agent won't @ them.
This commit is contained in:
Dustin Hildebrandt
2021-05-29 03:29:53 -05:00
committed by GitHub
parent 8a805716e3
commit 9ead8bb1f1
3 changed files with 12 additions and 3 deletions

View File

@@ -249,7 +249,10 @@ class DiscordAgent
NotificationAgentKey.DISCORD,
type
) &&
user.settings?.discordId
user.settings?.discordId &&
// Check if it's the user's own auto-approved request
(type !== Notification.MEDIA_AUTO_APPROVED ||
user.id !== payload.request?.requestedBy.id)
)
.map((user) => `<@${user.settings?.discordId}>`)
.join(' ');

View File

@@ -208,7 +208,10 @@ class EmailAgent
NotificationAgentKey.EMAIL,
type
) ??
true))
true)) &&
// Check if it's the user's own auto-approved request
(type !== Notification.MEDIA_AUTO_APPROVED ||
user.id !== payload.request?.requestedBy.id)
)
.map(async (user) => {
logger.debug('Sending email notification', {

View File

@@ -185,7 +185,10 @@ class WebPushAgent
NotificationAgentKey.WEBPUSH,
type
) ??
true)
true) &&
// Check if it's the user's own auto-approved request
(type !== Notification.MEDIA_AUTO_APPROVED ||
user.id !== payload.request?.requestedBy.id)
);
const allSubs = await userPushSubRepository