diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-22 15:51:18 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-22 15:51:18 +0000 |
| commit | 00cb8d9dcee9a403fedb2800a0cdc4b0f77a0429 (patch) | |
| tree | 59230ab336bf3bd13f0d046c6f45842a7fbdd02c | |
| parent | 19bde84f6db6c27d2e8fd92c97bfcf53fa36a438 (diff) | |
| parent | a7567ce6d01781b4b1ff47f805b4a9a5109e960b (diff) | |
Merge branch 'master' into 'rc/2.2.2'
# Conflicts:
# CHANGELOG.md
| -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) { |