aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShpuld Shpuldson <shp@cock.li>2020-08-27 17:13:43 +0300
committerShpuld Shpuldson <shp@cock.li>2020-08-27 17:13:43 +0300
commitd09f43ba7a179cdca9a2d808631f8ba213dd7710 (patch)
tree668ebbcd6818b3c7ad70a372c9f77fa9cffb6a3f /src
parent748c4d8c71b42cd7dfc748c1713b22e06faf167c (diff)
parentc7ddfefe34a254fd1e939fb652696f04891d5060 (diff)
Merge branch '2.1.0-rc0' of git.pleroma.social:pleroma/pleroma-fe into 2.1.0-rc0
Diffstat (limited to 'src')
-rw-r--r--src/services/notifications_fetcher/notifications_fetcher.service.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index 80be02ca..133e913f 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -11,9 +11,12 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
const rootState = store.rootState || store.state
const timelineData = rootState.statuses.notifications
const hideMutedPosts = getters.mergedConfig.hideMutedPosts
+ const allowFollowingMove = rootState.users.currentUser.allow_following_move
args['withMuted'] = !hideMutedPosts
+ args['withMove'] = !allowFollowingMove
+
args['timeline'] = 'notifications'
if (older) {
if (timelineData.minId !== Number.POSITIVE_INFINITY) {