From 73a61471520832bb673ed13dcdbe9ba248a5ec86 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 4 Jul 2023 06:37:45 +0000
Subject: [PATCH] use store and jsonapi to set following state of a blubber
thread, fixes #2800
Closes #2800
Merge request studip/studip!1889
---
.../JsonApi/Routes/Blubber/ThreadsUpdate.php | 20 ++++++++++++++--
resources/assets/javascripts/lib/blubber.js | 23 ++++++++-----------
resources/vue/store/blubber.js | 9 +++-----
3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/lib/classes/JsonApi/Routes/Blubber/ThreadsUpdate.php b/lib/classes/JsonApi/Routes/Blubber/ThreadsUpdate.php
index a85db30e95c..5c698a35c7e 100644
--- a/lib/classes/JsonApi/Routes/Blubber/ThreadsUpdate.php
+++ b/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.';
+ }
+ }
}
}
diff --git a/resources/assets/javascripts/lib/blubber.js b/resources/assets/javascripts/lib/blubber.js
index 44d91bd9c10..3e93985e493 100644
--- a/resources/assets/javascripts/lib/blubber.js
+++ b/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,
diff --git a/resources/vue/store/blubber.js b/resources/vue/store/blubber.js
index c6730801f0d..9cc474a5b1d 100644
--- a/resources/vue/store/blubber.js
+++ b/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 }) {
--
GitLab