Fix sending email notification to deleted users

docs/CHANGELOG.md

@@ -6,6 +6,7 @@ Changelog
 - Enh #353: Tests for `next` version
 - Fix #354: Don't display date badge twice after update a message
 - Fix #356: Fix visibility of the method `Controller::getAccessRules()`
+- Fix #358: Fix sending email notification to deleted users
 
 3.1.1  (September 19, 2023)
 ---------------------------

models/MessageNotification.php

@@ -53,9 +53,7 @@ public function notify(User $user)
             // Backup the flag because it may be forced per user in order to select a proper notification type
             $isNewConversation = $this->isNewConversation;
 
-            if ($this->isSendMail($user)) {
-                $this->sendMail($user);
-            }
+            $this->sendMail($user);
 
             // Restore the flag
             $this->isNewConversation = $isNewConversation;
@@ -73,8 +71,12 @@ private function sendLiveEvent(User $user)
         ]));
     }
 
-    private function isSendMail(User $user): bool
+    private function canReceiveMail(User $user): bool
     {
+        if ($user->email === null) {
+            return false;
+        }
+
         if ($user->is($this->getEntrySender())) {
             return false;
         }
@@ -105,6 +107,10 @@ private function getNotificationCategory(): NotificationCategory
 
     private function sendMail(User $user)
     {
+        if (!$this->canReceiveMail($user)) {
+            return;
+        }
+
         Yii::$app->i18n->setUserLocale($user);
 
         $mail = Yii::$app->mailer->compose([
@@ -183,4 +189,4 @@ protected function getSubject(): string
             : Yii::t('MailModule.models_Message', 'New message from {senderName}', $params);
     }
 
-}
+}