diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-01-18 13:35:53 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-01-18 13:35:53 +0000 |
| commit | 8f55cb151c546eae56c782c2ed4b292b04950e03 (patch) | |
| tree | b15c3cb41b469e732db1060d9962ce80b10c9562 /src | |
| parent | 4f0c43bd847047229f12b47992a42cdd6583d2d2 (diff) | |
| parent | a39866308cd7c8cb0d30a04a5215d1fae8bf8d47 (diff) | |
Merge branch 'master' into 'rc/2.2.3'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src')
| -rw-r--r-- | src/services/notifications_fetcher/notifications_fetcher.service.js | 3 |
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 beeb167c..5f9c1e5e 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) { |