Merge branch 'master' into 'rc/2.2.3'
# Conflicts: # CHANGELOG.md
This commit is contained in:
commit
8f55cb151c
|
@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||
### Changed
|
||||
- Don't filter own posts when they hit your wordfilter
|
||||
|
||||
|
||||
## [2.2.2] - 2020-12-22
|
||||
### Added
|
||||
- Mouseover titles for emojis in reaction picker
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue