diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-09-20 15:23:13 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-09-20 15:23:13 +0000 |
| commit | dcef84363ff0656940d095d2c010ca13252000e8 (patch) | |
| tree | 9e92df60075bee0285e6b34d8b433cb6065f3b3f /src/services/notifications_fetcher/notifications_fetcher.service.js | |
| parent | 9b163d281670e0c0a589adce46727284fbcba0ad (diff) | |
| parent | 1306fac38f46b5578d46cc6abd6168a3399886b1 (diff) | |
Merge branch 'muting-fixes' into 'develop'
Properly detect thread-muted posts and set `with_muted` when fetching notifications
See merge request pleroma/pleroma-fe!941
Diffstat (limited to 'src/services/notifications_fetcher/notifications_fetcher.service.js')
| -rw-r--r-- | src/services/notifications_fetcher/notifications_fetcher.service.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js index f9ec3f6e..b6c4cf80 100644 --- a/src/services/notifications_fetcher/notifications_fetcher.service.js +++ b/src/services/notifications_fetcher/notifications_fetcher.service.js @@ -10,6 +10,11 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => { const args = { credentials } const rootState = store.rootState || store.state const timelineData = rootState.statuses.notifications + const hideMutedPosts = typeof rootState.config.hideMutedPosts === 'undefined' + ? rootState.instance.hideMutedPosts + : rootState.config.hideMutedPosts + + args['withMuted'] = !hideMutedPosts args['timeline'] = 'notifications' if (older) { |