Enh #424: Allow sending a message with attached files only, such as a…

…n image (#425)

controllers/MailController.php

@@ -138,6 +138,11 @@ public function actionReply($id)
 
         // Reply Form
         $replyForm = new ReplyForm(['model' => $message]);
+
+        if (!empty(Yii::$app->request->post('fileList'))) {
+            $replyForm->scenario = ReplyForm::SCENARIO_HAS_FILES;
+        }
+
         if ($replyForm->load(Yii::$app->request->post()) && $replyForm->save()) {
             return $this->asJson([
                 'success' => true,

docs/CHANGELOG.md

@@ -11,6 +11,7 @@ Changelog
 - Enh #418: Update Active Form for Bootstrap 5
 - Enh #422: Changed deprecated `DOMSubtreeModified` to `MutationObserver`
 - Fix #423: Fix rendering of attached files on new reply by PushService
+- Enh #424: Allow sending a message with attached files only, such as an image
 
 3.2.2 (July 9, 2024)
 --------------------

models/AbstractMessageEntry.php

@@ -41,8 +41,6 @@ abstract class AbstractMessageEntry extends ActiveRecord
     public const TYPE_USER_JOINED = 1;
     public const TYPE_USER_LEFT = 2;
 
-    protected bool $requiredContent = true;
-
     /**
      * Get type of the message entry
      *
@@ -78,14 +76,8 @@ public static function tableName()
      */
     public function rules()
     {
-        $requiredColumns = ['message_id', 'user_id'];
-
-        if ($this->requiredContent) {
-            $requiredColumns[] = 'content';
-        }
-
         return [
-            [$requiredColumns, 'required'],
+            [['message_id', 'user_id'], 'required'],
             [['message_id', 'user_id', 'created_by', 'updated_by'], 'integer'],
             [['created_at', 'updated_at'], 'safe'],
         ];

models/MessageEntry.php

@@ -15,6 +15,11 @@
  */
 class MessageEntry extends AbstractMessageEntry implements ViewableInterface
 {
+    /**
+     * Scenario - when related content has attached files
+     */
+    public const SCENARIO_HAS_FILES = 'hasFiles';
+
     /**
      * @inheritdoc
      */
@@ -23,6 +28,16 @@ public static function type(): int
         return self::TYPE_MESSAGE;
     }
 
+    /**
+     * @inerhitdoc
+     */
+    public function rules()
+    {
+        return array_merge(parent::rules(), [
+            [['content'], 'required', 'except' => [self::SCENARIO_HAS_FILES]],
+        ]);
+    }
+
     /**
      * @inheritdoc
      */

models/forms/ReplyForm.php

@@ -14,6 +14,11 @@
  */
 class ReplyForm extends Model
 {
+    /**
+     * Scenario - when related content has attached files
+     */
+    public const SCENARIO_HAS_FILES = 'hasFiles';
+
     /**
      * @var Message
      */
@@ -35,7 +40,7 @@ class ReplyForm extends Model
     public function rules()
     {
         return [
-            ['message', 'required'],
+            ['message', 'required', 'except' => [self::SCENARIO_HAS_FILES]],
             ['message', 'validateRecipients'],
         ];
     }
@@ -77,6 +82,9 @@ public function save()
             'user_id' => Yii::$app->user->id,
             'content' => $this->message,
         ]);
+        if ($this->scenario === self::SCENARIO_HAS_FILES) {
+            $this->reply->scenario = MessageEntry::SCENARIO_HAS_FILES;
+        }
 
         if ($this->reply->save()) {
             $this->reply->refresh(); // Update created_by date, otherwise db expression is set...

models/states/AbstractMessageState.php

@@ -19,8 +19,6 @@
  */
 abstract class AbstractMessageState extends AbstractMessageEntry
 {
-    protected bool $requiredContent = false;
-
     /**
      * @inheritdoc
      */

resources/js/humhub.mail.ConversationView.js

@@ -79,6 +79,10 @@ humhub.module('mail.ConversationView', function (module, require, $) {
                         filePreview.hide();
                         filePreview.children('ul.files').html('');
                     }
+                    var fileListInputs = that.getReplyFileListInputs();
+                    if (fileListInputs.length) {
+                        fileListInputs.remove();
+                    }
                     that.scrollToBottom();
                     if (!view.isSmall()) { // prevent autofocus on mobile
                         that.focus();
@@ -109,6 +113,10 @@ humhub.module('mail.ConversationView', function (module, require, $) {
         return this.$.find('.post-file-list');
     };
 
+    ConversationView.prototype.getReplyFileListInputs = function () {
+        return this.$.find('input[name="fileList[]"]');
+    };
+
 
     ConversationView.prototype.focus = function (evt) {
         var replyRichtext = this.getReplyRichtext();

resources/js/humhub.mail.messenger.bundle.js

@@ -79,6 +79,10 @@ humhub.module('mail.ConversationView', function (module, require, $) {
                         filePreview.hide();
                         filePreview.children('ul.files').html('');
                     }
+                    var fileListInputs = that.getReplyFileListInputs();
+                    if (fileListInputs.length) {
+                        fileListInputs.remove();
+                    }
                     that.scrollToBottom();
                     if (!view.isSmall()) { // prevent autofocus on mobile
                         that.focus();
@@ -109,6 +113,10 @@ humhub.module('mail.ConversationView', function (module, require, $) {
         return this.$.find('.post-file-list');
     };
 
+    ConversationView.prototype.getReplyFileListInputs = function () {
+        return this.$.find('input[name="fileList[]"]');
+    };
+
 
     ConversationView.prototype.focus = function (evt) {
         var replyRichtext = this.getReplyRichtext();