Issues-593: Further watch changes

Author: atelomycterus

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

@@ -1435,7 +1435,7 @@ public function recordAdvancedNotications($activityModel, $activity, $discussion
 
             $userID = $row['UserID'];
 
-            if (in_array($userID, $removeUserIDs)) {
+            if ($row['Value'] == '2' && in_array($userID, $removeUserIDs)) {
                 continue;
             }
 

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

@@ -2890,6 +2890,40 @@ public function bookmark($discussionID, $userID, $bookmarked = null) {
         return (int)$bookmarked;
     }
 
+    /**
+     * Bookmarks (or unbookmarks) all discussions in a category for the specified user.
+     *
+     * @param int|array $CategoryID The id of the category.
+     * @param int $userID The unique id of the user.
+     * @param bool|null $bookmarked Whether or not to bookmark or unbookmark. Pass null to toggle the bookmark.
+     */
+    public function bookmarkAll($categoryID, $userID, $bookmarked) {
+
+        if(is_numeric($categoryID)) {
+            $categoryID = [$categoryID];
+        }
+        $discussions =  $this->SQL
+            ->select('ud.DiscussionID')
+            ->from('UserDiscussion ud')
+            ->join('Discussion d', 'ud.DiscussionID = d.DiscussionID ')
+            ->join('Category c', 'd.CategoryID = c.CategoryID')
+            ->where('ud.UserID', $userID)
+            ->where('c.CategoryID', $categoryID)
+            ->get()->resultArray();
+        $discussionIDs = array_column($discussions, 'DiscussionID');
+        if(count($discussionIDs) > 0 ) {
+            // Update the bookmarked value.
+            $this->SQL
+                ->update('UserDiscussion')
+                ->set('Bookmarked', $bookmarked)
+                ->where('UserID', $userID)
+                ->where('DiscussionID', $discussionIDs)
+                ->put();
+
+            $this->setUserBookmarkCount($userID);
+        }
+    }
+
     /**
      * Bookmarks (or unbookmarks) a discussion for specified user.
      *

vanilla/applications/vanilla/views/discussions/helper_functions.php

@@ -91,33 +91,35 @@ function bookmarkButton($discussion) {
             );
         } else {
             $notificationPreferences = $categoryModel->getCategoryNotificationPreferences($discussion->CategoryID, Gdn::session()->UserID);
-
             $categoryNotificationPreferences = $notificationPreferences[$discussion->CategoryID];
-            $newEmailDiscussionKey = 'Preferences.Email.NewDiscussion.' . $discussion->CategoryID;
+            $newEmailDiscussionKey = 'Preferences.Email.NewComment.' . $discussion->CategoryID;
+            //$newPopupDiscussionKey = 'Preferences.Popup.NewComment.' . $discussion->CategoryID;
             $hasWatchedCategory = val($newEmailDiscussionKey, $categoryNotificationPreferences);
 
-            $hasWatched = false;
-            // Author is added by default with Bookmarked = 0, Participated = 1
-            $isAuthor = ($discussion->InsertUserID == Gdn::session()->UserID);
-
-            // If Watched Category: unwatched discussion
-            if ($discussion->Bookmarked === null) {
-                $hasWatched = $hasWatchedCategory == '1' || $hasWatchedCategory == '2' ? true: false;
-                $newValue = $hasWatched ? 0 : 1;
-            } else if ($discussion->Bookmarked == 0) {
-                $hasWatched = false;
-                if ($isAuthor) {
-                    $hasWatched = $hasWatchedCategory == '1' || $hasWatchedCategory == '2'? true: false;
-                    $newValue = 2;
-                } else {
+            if($hasWatchedCategory == '1') { // The watched category
+                $hasWatched  = true;
+                $newValue = 0;
+            } else if($hasWatchedCategory == '2') {// The watched category except some discussions
+                if ($discussion->Bookmarked === null) {
+                    $hasWatched  = true;
+                    $newValue = 0;
+                } else if ($discussion->Bookmarked == 0) {
+                    $hasWatched  = false;
                     $newValue = 1;
+                } else if ($discussion->Bookmarked == 1) {
+                    $hasWatched  = true;
+                    $newValue = 0;
                 }
-            } else if ($discussion->Bookmarked == 1) {
-                $hasWatched = true;
-                $newValue = $isAuthor ? 2 : 0;
-            } else if ($discussion->Bookmarked == 2) {
+            } else {
                 $hasWatched = false;
-                $newValue = 1;
+                if ($discussion->Bookmarked === null) {
+                    $newValue = 1;
+                } else if ($discussion->Bookmarked == 0) {
+                    $newValue = 1;
+                } else if ($discussion->Bookmarked == 1) {
+                    $hasWatched = true;
+                    $newValue = 0;
+                }
             }
 
             $title = t($hasWatched ? 'Stop watching the discussion' : 'Watch the discussion');