pleroma-fe

commit: 790b8555dc0911ec2d6f2c2f0ed5e2506bc462e7
parent: dea7e2f6acd06839c89cd4a14a101ec162ca4e58
Author: Shpuld Shpludson <shp@cock.li>
Date:   Fri,  1 May 2020 14:41:00 +0000

Merge branch 'fix/remove-with_move-param' into 'develop'

Remove with_move param

See merge request pleroma/pleroma-fe!1094
Diffstat:
M
src/services/api/api.service.js
6
+-----
M
src/services/notifications_fetcher/notifications_fetcher.service.js
3
---

2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
@@ -495,8 +495,7 @@ const fetchTimeline = ({
   until = false,
   userId = false,
   tag = false,
-  withMuted = false,
-  withMove = false
+  withMuted = false
 }) => {
   const timelineUrls = {
     public: MASTODON_PUBLIC_TIMELINE,
@@ -536,9 +535,6 @@ const fetchTimeline = ({
   if (timeline === 'public' || timeline === 'publicAndExternal') {
     params.push(['only_media', false])
   }
-  if (timeline === 'notifications') {
-    params.push(['with_move', withMove])
-  }
 
   params.push(['limit', 20])
   params.push(['with_muted', withMuted])
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -11,12 +11,9 @@ 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) {