Notification for Gallery instead of single Media file

activities/MediaUploaded.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) 2022 HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
+
+namespace humhub\modules\gallery\activities;
+
+use humhub\modules\activity\components\BaseActivity;
+use humhub\modules\activity\interfaces\ConfigurableActivityInterface;
+use humhub\modules\comment\models\Comment;
+use humhub\modules\gallery\models\CustomGallery;
+use Yii;
+
+/**
+ * MediaUploaded activity
+ */
+class MediaUploaded extends BaseActivity implements ConfigurableActivityInterface
+{
+
+    /**
+     * @inheritdoc
+     */
+    public $moduleId = 'gallery';
+
+    /**
+     * @inheritdoc
+     */
+    public $viewName = 'mediaUploaded';
+
+    /**
+     * @var CustomGallery
+     */
+    public $source;
+
+    /**
+     * @inheritdoc
+     */
+    public function getTitle()
+    {
+        return Yii::t('GalleryModule.base', 'Galleries');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDescription()
+    {
+        return Yii::t('CommentModule.base', 'Whenever new media files were uploaded.');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getUrl()
+    {
+        return $this->source->url;
+    }
+
+}

activities/views/mediaUploaded.php

@@ -0,0 +1,13 @@
+<?php
+
+use humhub\modules\gallery\models\CustomGallery;
+use humhub\modules\user\models\User;
+use yii\helpers\Html;
+
+/* @var $originator User */
+/* @var $source CustomGallery */
+
+echo Yii::t('GalleryModule.base', '{displayName} uploaded new media files into the Gallery "{galleryName}"', [
+    'displayName' => '<strong>' . Html::encode($originator->displayName) . '</strong>',
+    'galleryName' => Html::encode($source->title)
+]);

controllers/CustomGalleryController.php

@@ -8,7 +8,6 @@
 
 namespace humhub\modules\gallery\controllers;
 
-use humhub\debug\RDebug;
 use humhub\modules\file\libs\FileHelper;
 use humhub\modules\gallery\helpers\Url;
 use humhub\modules\gallery\models\BaseGallery;
@@ -165,10 +164,18 @@ public function actionUpload()
 
         $errors = false;
         $files = [];
+        $isNewFileUploaded = false;
         foreach (UploadedFile::getInstancesByName('files') as $cFile) {
             $result = $this->handleMediaUpload($gallery, $cFile);
             $errors |= $result['error'];
             $files[] = $result;
+            if (!$result['error']) {
+                $isNewFileUploaded = true;
+            }
+        }
+
+        if ($isNewFileUploaded) {
+            $gallery->notify();
         }
 
         return $this->asJson(['files' => $files]);

docs/CHANGELOG.md

@@ -5,6 +5,7 @@ Changelog
 -----------------------
 - Fix #89: Fix tests
 - Fix #71: Improve wall entry styles for small screens
+- Enh #36: Notification for Gallery instead of single Media file
 
 
 1.2.2 (November 27, 2020)

models/BaseGallery.php

@@ -18,6 +18,7 @@
  * @property integer $sort_order
  * @property integer $thumb_file_id
  * @property integer $type
+ * @property-read string $url
  *
  * @package humhub.modules.gallery.models
  * @since 1.0

models/CustomGallery.php

@@ -4,10 +4,9 @@
 
 use humhub\modules\content\components\ActiveQueryContent;
 use humhub\modules\content\components\ContentContainerActiveRecord;
-use humhub\modules\content\models\Content;
-use humhub\modules\space\models\Space;
-use Yii;
 use humhub\modules\gallery\helpers\Url;
+use humhub\modules\user\models\User;
+use Yii;
 
 /**
  * This is the model class for a custom gallery.
@@ -103,4 +102,22 @@ public function isEmpty()
         return $this->mediaListQuery()->one() === null;
     }
 
+    /**
+     * Notify users about new uploaded media files
+     */
+    public function notify()
+    {
+        /* @var User $user */
+        $user = Yii::$app->user->getIdentity();
+
+        \humhub\modules\gallery\notifications\MediaUploaded::instance()
+            ->from($user)
+            ->about($this)
+            ->sendBulk($this->getFollowersWithNotificationQuery());
+
+        \humhub\modules\gallery\activities\MediaUploaded::instance()
+            ->from($user)
+            ->about($this)
+            ->save();
+    }
 }

models/Media.php

@@ -50,6 +50,11 @@ class Media extends ContentActiveRecord implements Searchable
      */
     public $wallEntryClass = "humhub\modules\gallery\widgets\WallEntryMedia";
 
+    /**
+     * @inheritdoc
+     */
+    public $silentContentCreation = true;
+
     /**
      * @inheritdoc
      */
@@ -210,20 +215,13 @@ public function handleUpload(UploadedFile $file)
     {
         $mediaUpload = new MediaUpload();
         $mediaUpload->setUploadedFile($file);
-        $valid = $mediaUpload->validate();
-
-        if ($valid) {
+        if ($mediaUpload->validate()) {
             $this->title = $mediaUpload->file_name;
-
-            $valid = $this->validate();
-
-            if ($valid) {
-                if ($this->save()) {
-                    $mediaUpload->object_model = self::class;
-                    $mediaUpload->object_id = $this->id;
-                    $mediaUpload->show_in_stream = false;
-                    $mediaUpload->save();
-                }
+            if ($this->validate() && $this->save()) {
+                $mediaUpload->object_model = self::class;
+                $mediaUpload->object_id = $this->id;
+                $mediaUpload->show_in_stream = false;
+                $mediaUpload->save();
             }
         }
 

notifications/GalleryNotificationCategory.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) 2022 HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
+
+namespace humhub\modules\gallery\notifications;
+
+use humhub\modules\notification\components\NotificationCategory;
+use Yii;
+
+/**
+ * GalleryNotificationCategory
+ */
+class GalleryNotificationCategory extends NotificationCategory
+{
+
+    /**
+     * @inheritdoc
+     */
+    public $id = 'gallery';
+
+    /**
+     * @inheritdoc
+     */
+    public function getTitle()
+    {
+        return Yii::t('GalleryModule.base', 'Gallery');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDescription()
+    {
+        return Yii::t('GalleryModule.base', 'Receive Notifications for new uploaded media files.');
+    }
+}

notifications/MediaUploaded.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) 2022 HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
+
+namespace humhub\modules\gallery\notifications;
+
+use humhub\modules\gallery\models\CustomGallery;
+use humhub\modules\notification\components\BaseNotification;
+use Yii;
+use yii\bootstrap\Html;
+
+/**
+ * MediaUploaded notification for multiple files uploaded.
+ */
+class MediaUploaded extends BaseNotification
+{
+
+    /**
+     * @inheritdoc
+     */
+    public $viewName = 'mediaUploaded';
+
+    /**
+     * @inheritdoc
+     */
+    public $moduleId = 'gallery';
+
+    /**
+     * @inheritdoc
+     * @var CustomGallery
+     */
+    public $source;
+
+    /**
+     * @inheritdoc
+     */
+    public function category()
+    {
+        return new GalleryNotificationCategory();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function html()
+    {
+        return Yii::t('GalleryModule.base', '{displayName} uploaded new files into {contentTitle}.', [
+            'displayName' => Html::tag('strong', Html::encode($this->originator->displayName)),
+            'contentTitle' => $this->getContentInfo($this->source)
+        ]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMailSubject()
+    {
+        return Yii::t('GalleryModule.base', '{originator} uploaded files into {contentTitle}', [
+            'originator' => $this->originator->displayName,
+            'contentTitle' => $this->getContentInfo($this->source)
+        ]);
+    }
+}

notifications/views/mails/mediaUploaded.php

@@ -0,0 +1,39 @@
+<?php
+
+use humhub\modules\gallery\notifications\MediaUploaded;
+use humhub\modules\notification\models\Notification;
+use humhub\modules\space\models\Space;
+use humhub\modules\user\models\User;
+use humhub\widgets\mails\MailButton;
+use humhub\widgets\mails\MailButtonList;
+use humhub\widgets\mails\MailContentEntry;
+use yii\web\View;
+
+/* @var $this View */
+/* @var $viewable MediaUploaded */
+/* @var $url string */
+/* @var $date string */
+/* @var $originator User */
+/* @var $space Space */
+/* @var $record Notification */
+/* @var $_params_ array */
+?>
+<?php $this->beginContent('@notification/views/layouts/mail.php', $_params_); ?>
+
+    <?= MailContentEntry::widget([
+        'originator' => $originator,
+        'receiver' => $record->user,
+        'content' => Yii::t('GalleryModule.base', 'New files have been uploaded into the gallery "{galleryName}".', [
+            'galleryName' => $viewable->source->title
+        ]),
+        'date' => $date,
+        'space' => $space
+    ]) ?>
+
+    <?= MailButtonList::widget([
+        'buttons' => [
+            MailButton::widget(['url' => $url, 'text' => Yii::t('GalleryModule.base', 'View Online')])
+        ]
+    ]) ?>
+
+<?php $this->endContent();