Fix #388: Notification not sent to the participant added to the conversion

Author: marc-farre

docs/CHANGELOG.md

@@ -5,6 +5,7 @@ Unreleased
 ----------------------
 - Enh #382: Implement provider for meta searching
 - Enh #188: Add "Like" to message entries
+- Fix #388: Notification not sent to the participant added to the conversion
 
 3.2.1 (April 15, 2024)
 ----------------------

models/Message.php

@@ -189,6 +189,7 @@ public function getLastEntry(): ?MessageEntry
         if ($this->_lastEntry === null) {
             $this->_lastEntry = MessageEntry::find()
                 ->where(['message_id' => $this->id])
+                ->andWhere(['not', ['entry_content' => null]])
                 ->orderBy('created_at DESC')
                 ->limit(1)
                 ->one();
@@ -229,7 +230,7 @@ public function getLastActiveParticipant(bool $includeMe = false): User
     public function deleteEntry($entry)
     {
         if ($entry->message->id == $this->id) {
-            if($this->getEntries()->count() > 1) {
+            if ($this->getEntries()->count() > 1) {
                 $entry->delete();
             } else {
                 $this->delete();

models/forms/InviteParticipantForm.php

@@ -2,15 +2,15 @@
 
 namespace humhub\modules\mail\models\forms;
 
+use humhub\modules\mail\helpers\Url;
 use humhub\modules\mail\models\Message;
 use humhub\modules\mail\models\MessageNotification;
 use humhub\modules\mail\models\UserMessage;
+use humhub\modules\mail\permissions\SendMail;
+use humhub\modules\user\models\User;
 use Yii;
 use yii\base\Model;
-use humhub\modules\user\models\User;
-use humhub\modules\mail\permissions\SendMail;
 use yii\helpers\Html;
-use humhub\modules\mail\helpers\Url;
 
 /**
  * @package humhub.modules.mail.forms
@@ -72,9 +72,9 @@ public function checkRecipient($attribute, $params)
                 $name = Html::encode($user->getDisplayName());
                 if (Yii::$app->user->identity->is($user)) {
                     $this->addError($attribute, Yii::t('MailModule.forms_InviteRecipientForm', "You cannot send a email to yourself!"));
-                } else if($this->message->isParticipant($user)) {
+                } else if ($this->message->isParticipant($user)) {
                     $this->addError($attribute, Yii::t('MailModule.forms_InviteRecipientForm', "User {name} is already participating!", ['name' => $name]));
-                } else if(!$user->can(SendMail::class) && !Yii::$app->user->isAdmin()){
+                } else if (!$user->can(SendMail::class) && !Yii::$app->user->isAdmin()) {
                     $this->addError($attribute, Yii::t('MailModule.forms_InviteRecipientForm', "You are not allowed to send user {name} is already!", ['name' => $name]));
                 } else {
                     $this->recipientUsers[] = $user;
@@ -95,7 +95,7 @@ public function getUrl()
 
     public function save()
     {
-        if(!$this->validate()) {
+        if (!$this->validate()) {
             return false;
         }
 
@@ -106,7 +106,7 @@ public function save()
                 'is_originator' => 0
             ]);
 
-            if($userMessage->save()) {
+            if ($userMessage->save()) {
                 (new MessageNotification($this->message))->notify($user);
             }
         }

widgets/InboxMessagePreview.php

@@ -155,7 +155,7 @@ private function getMessageTime(): string
 
     public function getLastEntry(): ?MessageEntry
     {
-        return $this->getMessage()->getLastEntry();
+        return $this->getMessage()->lastEntry;
     }
 
     private function isGroupChat(): bool