diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-03-01 18:06:55 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-03-01 18:06:55 +0000 |
| commit | 0ac34b3014a1499ef5f3de7d3c321119dd10ab26 (patch) | |
| tree | 695ccbd352c82cb0f08fc78ff85bf23888561a8e | |
| parent | 06cde8ad0621b4ab9e29f64e3d267e32e1c1dff6 (diff) | |
| parent | 320418d524a33c20d7d769c8d67a25be81f251ec (diff) | |
Merge branch 'master' into 'rc/2.3.0'
# Conflicts:
# CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/services/notifications_fetcher/notifications_fetcher.service.js | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7184749f..5263cc31 100644 --- 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 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) { |