use store and jsonapi to set following state of a blubber thread, fixes #2800

Closes #2800

Merge request studip/studip!1889

lib/classes/JsonApi/Routes/Blubber/ThreadsUpdate.php

@@ -35,12 +35,21 @@ class ThreadsUpdate extends JsonApiController
             throw new AuthorizationFailedException();
         }
 
-        $visitedAt = self::arrayGet($json, 'data.attributes.visited-at');
-        if ($visitedAt) {
+        if (self::arrayHas($json, 'data.attributes.visited-at')) {
+            $visitedAt = self::arrayGet($json, 'data.attributes.visited-at');
             $visitedDate = self::fromISO8601($visitedAt)->getTimestamp();
             $GLOBALS['user']->cfg->store('BLUBBERTHREAD_VISITED_' . $thread->getId(), $visitedDate);
         }
 
+        if (self::arrayHas($json, 'data.attributes.is-followed')) {
+            $isFollowed = self::arrayGet($json, 'data.attributes.is-followed');
+            if ($isFollowed) {
+                $thread->addFollowingByUser($user->id);
+            } else {
+                $thread->removeFollowingByUser($user->id);
+            }
+        }
+
         return $this->getContentResponse($thread);
     }
 
@@ -52,5 +61,12 @@ class ThreadsUpdate extends JsonApiController
                 return '`visited-at` is not an ISO 8601 timestamp.';
             }
         }
+
+        if (self::arrayHas($json, 'data.attributes.is-followed')) {
+            $isFollowed = self::arrayGet($json, 'data.attributes.is-followed');
+            if (!is_bool($isFollowed)) {
+                return '`is-followed` is not a boolean value.';
+            }
+        }
     }
 }

resources/assets/javascripts/lib/blubber.js

@@ -41,19 +41,16 @@ const Blubber = {
         }
         elements.addClass('loading');
 
-        const promise = follow
-            ? STUDIP.api.POST(`blubber/threads/${thread_id}/follow`)
-            : STUDIP.api.DELETE(`blubber/threads/${thread_id}/follow`);
-
-        return promise
-            .then(() => {
-                elements.toggleClass('unfollowed', !follow);
-                return follow;
-            })
-            .always(() => {
-                elements.removeClass('loading');
-            })
-            .promise();
+        return STUDIP.Vue.load().then(async ({ store }) => {
+            return store.dispatch('studip/blubber/changeThreadSubscription', {
+                id: thread_id,
+                subscribe: follow,
+            });
+        }).then(() => {
+            elements.toggleClass('unfollowed', !follow);
+        }).finally(() => {
+            elements.removeClass('loading');
+        });
     },
     Composer: {
         vue: null,

resources/vue/store/blubber.js

@@ -119,12 +119,9 @@ export default {
     },
     actions: {
         changeThreadSubscription({ dispatch, rootGetters }, { id, subscribe }) {
-            return STUDIP.Blubber.followunfollow(id, subscribe).done((state) => {
-                const thread = rootGetters['blubber-threads/byId']({ id });
-                thread.attributes['is-followed'] = state;
-
-                return dispatch('blubber-threads/storeRecord', thread, { root: true });
-            });
+            const thread = rootGetters['blubber-threads/byId']({ id });
+            thread.attributes['is-followed'] = subscribe;
+            return dispatch('blubber-threads/update', thread, { root: true });
         },
 
         createComment({ dispatch, rootGetters }, { id, content }) {