fix(notifications): correctly send notifications for users that do no…

…t have any user settings yet fixes #1324
sct · Mar 30, 2021 · d3a25b9 · d3a25b9
1 parent a908c07
commit d3a25b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/server/lib/notifications/agents/discord.ts b/server/lib/notifications/agents/discord.ts
@@ -218,7 +218,7 @@ class DiscordAgent
 
       if (
         payload.notifyUser &&
-        payload.notifyUser.settings?.enableNotifications &&
+        (payload.notifyUser.settings?.enableNotifications ?? true) &&
         payload.notifyUser.settings?.discordId
       ) {
         mentionedUsers.push(payload.notifyUser.settings.discordId);

diff --git a/server/lib/notifications/agents/email.ts b/server/lib/notifications/agents/email.ts
@@ -1,13 +1,13 @@
-import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
-import { hasNotificationType, Notification } from '..';
 import path from 'path';
-import { getSettings, NotificationAgentEmail } from '../../settings';
-import logger from '../../../logger';
 import { getRepository } from 'typeorm';
+import { hasNotificationType, Notification } from '..';
+import { MediaType } from '../../../constants/media';
 import { User } from '../../../entity/User';
-import { Permission } from '../../permissions';
+import logger from '../../../logger';
 import PreparedEmail from '../../email';
-import { MediaType } from '../../../constants/media';
+import { Permission } from '../../permissions';
+import { getSettings, NotificationAgentEmail } from '../../settings';
+import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
 
 class EmailAgent
   extends BaseAgent<NotificationAgentEmail>
@@ -154,7 +154,7 @@ class EmailAgent
     try {
       if (
         payload.notifyUser &&
-        payload.notifyUser.settings?.enableNotifications
+        (payload.notifyUser.settings?.enableNotifications ?? true)
       ) {
         const email = new PreparedEmail(payload.notifyUser.settings?.pgpKey);
 
@@ -258,7 +258,7 @@ class EmailAgent
     try {
       if (
         payload.notifyUser &&
-        payload.notifyUser.settings?.enableNotifications
+        (payload.notifyUser.settings?.enableNotifications ?? true)
       ) {
         const email = new PreparedEmail(payload.notifyUser.settings?.pgpKey);
 
@@ -307,7 +307,7 @@ class EmailAgent
     try {
       if (
         payload.notifyUser &&
-        payload.notifyUser.settings?.enableNotifications
+        (payload.notifyUser.settings?.enableNotifications ?? true)
       ) {
         const email = new PreparedEmail(payload.notifyUser.settings?.pgpKey);
 

diff --git a/server/lib/notifications/agents/telegram.ts b/server/lib/notifications/agents/telegram.ts
@@ -1,8 +1,8 @@
 import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
+import { MediaType } from '../../../constants/media';
 import logger from '../../../logger';
 import { getSettings, NotificationAgentTelegram } from '../../settings';
-import { MediaType } from '../../../constants/media';
 import { BaseAgent, NotificationAgent, NotificationPayload } from './agent';
 
 interface TelegramMessagePayload {
@@ -180,7 +180,7 @@ class TelegramAgent
       // Send user notification
       if (
         payload.notifyUser &&
-        payload.notifyUser.settings?.enableNotifications &&
+        (payload.notifyUser.settings?.enableNotifications ?? true) &&
         payload.notifyUser.settings?.telegramChatId &&
         payload.notifyUser.settings?.telegramChatId !==
           this.getSettings().options.chatId