]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
fix(notifier): notifyModeratorsOfNewAbuse
authorkontrollanten <6680299+kontrollanten@users.noreply.github.com>
Fri, 11 Dec 2020 05:53:30 +0000 (06:53 +0100)
committerChocobozzz <chocobozzz@cpy.re>
Mon, 14 Dec 2020 08:34:47 +0000 (09:34 +0100)
closes #3445

server/lib/notifier.ts

index 1da81a535f0425d88172f2dc2ddbe8a11dd04031..6af7316f01cbc82aad8eaf9db10d61f3bf43cc14 100644 (file)
@@ -482,15 +482,16 @@ class Notifier {
       return { users: moderators, settingGetter, notificationCreator, emailSender: emailSenderModerators }
     }
 
-    const [ reporterOptions, moderatorsOptions ] = await Promise.all([
+    const options = await Promise.all([
       buildReporterOptions(),
       buildModeratorsOptions()
     ])
 
-    return Promise.all([
-      this.notify(reporterOptions),
-      this.notify(moderatorsOptions)
-    ])
+    return Promise.all(
+      options
+        .filter(opt => opt)
+        .map(this.notify)
+    )
   }
 
   private async notifyModeratorsOfVideoAutoBlacklist (videoBlacklist: MVideoBlacklistLightVideo) {