pleroma-fe

commit: 0ac34b3014a1499ef5f3de7d3c321119dd10ab26
parent 06cde8ad0621b4ab9e29f64e3d267e32e1c1dff6
Author: Shpuld Shpludson <shp@cock.li>
Date:   Mon,  1 Mar 2021 18:06:55 +0000

Merge branch 'master' into 'rc/2.3.0'

# Conflicts:
#   CHANGELOG.md
Diffstat:
M
CHANGELOG.md
1
+
M
src/services/notifications_fetcher/notifications_fetcher.service.js
3
+++

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added reason field for registration when approval is required
 - Group staff members by role in the About page
 
+
 ## [2.2.3] - 2021-01-18
 ### Added
 - Added Report button to status ellipsis menu for easier reporting
diff --git 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) {