diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-09-17 17:17:21 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-09-17 17:17:21 +0000 |
| commit | 30efbaab34b25834531c0f978cb4494eefeebfa1 (patch) | |
| tree | bdc628fbb9706b1257bd5623284246238878bd8b | |
| parent | 8ca0586c0f75d1ea70268f0951edb4dbbfc85271 (diff) | |
| parent | 938887ef91a12dcaaaaa0884af4e76abd1c6c679 (diff) | |
Merge branch 'master' into 'rc/2.1.2'
# Conflicts:
# CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/services/notifications_fetcher/notifications_fetcher.service.js | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index aed71445..0a5fb701 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -136,8 +136,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Ability to change user's email - About page - Added remote user redirect -- Bookmarks + ### Changed - changed the way fading effects for user profile/long statuses works, now uses css-mask instead of gradient background hacks which weren't exactly compatible with semi-transparent themes + ### Fixed - improved hotkey behavior on autocomplete popup diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js index 80be02ca..133e913f 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) { |