From f98c39529505cdd409babdb7674dcc779f0ec5af Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 14 Dec 2020 09:34:12 +0100
Subject: [PATCH] Keep scope in notifier

---
 server/lib/notifier.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/lib/notifier.ts b/server/lib/notifier.ts
index 6af7316f0..740c274d7 100644
--- a/server/lib/notifier.ts
+++ b/server/lib/notifier.ts
@@ -463,11 +463,11 @@ class Notifier {
 
     async function buildReporterOptions () {
       // Only notify our users
-      if (abuse.ReporterAccount.isOwned() !== true) return
+      if (abuse.ReporterAccount.isOwned() !== true) return undefined
 
       const reporter = await UserModel.loadByAccountActorId(abuse.ReporterAccount.actorId)
       // Don't notify my own message
-      if (reporter.Account.id === message.accountId) return
+      if (reporter.Account.id === message.accountId) return undefined
 
       return { users: [ reporter ], settingGetter, notificationCreator, emailSender: emailSenderReporter }
     }
@@ -477,7 +477,7 @@ class Notifier {
       // Don't notify my own message
       moderators = moderators.filter(m => m.Account.id !== message.accountId)
 
-      if (moderators.length === 0) return
+      if (moderators.length === 0) return undefined
 
       return { users: moderators, settingGetter, notificationCreator, emailSender: emailSenderModerators }
     }
@@ -489,8 +489,8 @@ class Notifier {
 
     return Promise.all(
       options
-        .filter(opt => opt)
-        .map(this.notify)
+        .filter(opt => !!opt)
+        .map(opt => this.notify(opt))
     )
   }