Merge pull request #238 from topcoder-platform/issues-226

Issues-213, Issues-226

Author: jmgasper

config/vanilla/config.php

@@ -56,14 +56,14 @@
 $Configuration['Garden']['Email']['SmtpPort'] = getenv('MAIL_SMTP_PORT');
 $Configuration['Garden']['Email']['SmtpSecurity'] = getenv('MAIL_SMTP_SECURITY');
 $Configuration['Garden']['UpdateToken'] = '105e786dc643fd20143d3c137b593af168560c13';
-$Configuration['Garden']['InputFormatter'] = 'Rich';
+$Configuration['Garden']['InputFormatter'] = 'Markdown';
 $Configuration['Garden']['Version'] = 'Undefined';
 $Configuration['Garden']['CanProcessImages'] = true;
 $Configuration['Garden']['Theme'] = 'topcoder-theme';
 $Configuration['Garden']['MobileTheme'] = 'topcoder-theme';
 $Configuration['Garden']['Profile']['EditPhotos'] = false;
 $Configuration['Garden']['SystemUserID'] = '1';
-$Configuration['Garden']['MobileInputFormatter'] = 'Rich';
+$Configuration['Garden']['MobileInputFormatter'] = 'Markdown';
 $Configuration['Garden']['AllowFileUploads'] = true;
 $Configuration['Garden']['EditContentTimeout'] = -1;
 $Configuration['Garden']['Profile']['EditPhotos'] = false;

vanilla/applications/vanilla/models/class.commentmodel.php

@@ -541,7 +541,7 @@ public function lookup(array $where = [], $permissionFilter = true, $limit = nul
      * @param array $comment
      * @param array $discussion
      */
-    private function notifyNewComment(?array $comment, ?array $discussion) {
+    public function notifyNewComment(?array $comment, ?array $discussion) {
         if ($comment === null || $discussion === null) {
             return;
         }
@@ -563,6 +563,13 @@ private function notifyNewComment(?array $comment, ?array $discussion) {
         $discussionUserID = $discussion["InsertUserID"] ?? null;
         $format = $comment["Format"] ?? null;
 
+        $mediaModel = new MediaModel();
+        $sqlWhere = [
+            'ForeignTable' => 'comment',
+            'ForeignID' => $commentID
+        ];
+        $mediaData = $mediaModel->getWhere($sqlWhere)->resultArray();
+
         // Prepare the notification queue.
         $data = [
             "ActivityType" => "Comment",
@@ -577,6 +584,7 @@ private function notifyNewComment(?array $comment, ?array $discussion) {
             "Data" => [
                 "Name" => $discussion["Name"] ?? null,
                 "Category" => $category["Name"] ?? null,
+                "Media" => $mediaData
             ]
         ];
 
@@ -1362,10 +1370,12 @@ public function save2($CommentID, $Insert, $CheckExisting = true, $IncUser = fal
             if ($Discussion->CategoryID > 0) {
                 CategoryModel::instance()->incrementLastComment($Fields);
             }
-            $this->notifyNewComment(
-                $Fields ? (array)$Fields : null,
-                $Discussion ? (array)$Discussion : null
-            );
+            if(!c('EnabledPlugins.editor', false)) {
+                $this->notifyNewComment(
+                    $Fields ? (array)$Fields : null,
+                    $Discussion ? (array)$Discussion : null
+                );
+            }
         }
     }
 

vanilla/applications/vanilla/models/class.discussionmodel.php

@@ -1969,6 +1969,7 @@ public function setField($rowID, $property, $value = false) {
     public function save($formPostValues, $settings = false) {
         // Define the primary key in this model's table.
         $this->defineSchema();
+        $sendNewDiscussionNotification = false;
 
         // If the site isn't configured to use categories, don't allow one to be set.
         if (!c('Vanilla.Categories.Use', true)) {
@@ -2223,7 +2224,7 @@ public function save($formPostValues, $settings = false) {
                     $formPostValues['DiscussionID'] = $discussionID;
 
                     $discussion = $this->getID($discussionID, DATASET_TYPE_ARRAY);
-                    $this->notifyNewDiscussion($discussion);
+                    $sendNewDiscussionNotification = true;
                 }
 
                 // Get CategoryID of this discussion
@@ -2244,7 +2245,18 @@ public function save($formPostValues, $settings = false) {
                 $this->EventArguments['FormPostValues'] = $formPostValues;
                 $this->EventArguments['Fields'] = $fields;
                 $this->EventArguments['DiscussionID'] = $discussionID;
+                $this->EventArguments['SendNewDiscussionNotification'] = $sendNewDiscussionNotification;
                 $this->fireEvent('AfterSaveDiscussion');
+
+
+                //FIX: https://github.com/topcoder-platform/forums/issues/213
+                // If the plugin is enabled then send notifications after updating MediaTables with discussionID
+                if ($sendNewDiscussionNotification === true) {
+                    if(!c('EnabledPlugins.editor', false)) {
+                        $discussion = $this->getID($discussionID, DATASET_TYPE_ARRAY);
+                        $this->notifyNewDiscussion($discussion);
+                    }
+                }
             }
         }
 
@@ -2288,6 +2300,13 @@ public function notifyNewDiscussion($discussion, $activityModel = null, $activit
             $code = "HeadlineFormat.Discussion";
         }
 
+        // FIX: https://github.com/topcoder-platform/forums/issues/213
+        $mediaModel = new MediaModel();
+        $sqlWhere = [
+          'ForeignTable' => 'discussion',
+          'ForeignID' => $discussionID
+        ];
+        $mediaData = $mediaModel->getWhere($sqlWhere)->resultArray();
         $data = [
             "ActivityType" => "Discussion",
             "ActivityUserID" => $insertUserID,
@@ -2301,6 +2320,7 @@ public function notifyNewDiscussion($discussion, $activityModel = null, $activit
             "Data" => [
                 "Name" => $name,
                 "Category" => $categoryName,
+                "Media" => $mediaData
             ]
         ];