From 726d5279c11de132192df2c2fa13579ea472aebe Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 12 May 2020 20:04:00 +0300 Subject: [PATCH 1/2] Revert "remove with_move param" This reverts commit 02c8a9e3143f2b12f44d24f307e2718dec22987b. --- src/services/api/api.service.js | 6 +++++- .../notifications_fetcher/notifications_fetcher.service.js | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 72c8874f18..9d1ce393fe 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -496,7 +496,8 @@ const fetchTimeline = ({ until = false, userId = false, tag = false, - withMuted = false + withMuted = false, + withMove = false }) => { const timelineUrls = { public: MASTODON_PUBLIC_TIMELINE, @@ -536,6 +537,9 @@ 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 index 64499a1b65..864e32f878 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) { From 0bc0a8d5f51f88858a7347b915361c45ff819292 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 12 May 2020 20:27:37 +0300 Subject: [PATCH 2/2] update changelog for 2.0.5 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a44fb1630d..125e8ce02d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Removed the use of with_move parameters when fetching notifications -## [Unreleased patch] +## [2.0.5] - 2020-05-12 ### Add - Added private notifications option for push notifications - 'Copy link' button for statuses (in the ellipsis menu)