diff options
| author | dave <starpumadev@gmail.com> | 2019-03-25 10:22:16 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-25 10:22:16 -0400 |
| commit | 4cec0d589dfc54987ec6f024b0a463d0abd847d2 (patch) | |
| tree | a88953cc409d162127edb43a702d6540c64c023e /src/services/timeline_fetcher/timeline_fetcher.service.js | |
| parent | 63d7c7bd80cf8028cdefee99c1cb75614385f96b (diff) | |
| parent | 01d05316998f90451e920f8ac8d4c264a13b0cd7 (diff) | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
Diffstat (limited to 'src/services/timeline_fetcher/timeline_fetcher.service.js')
| -rw-r--r-- | src/services/timeline_fetcher/timeline_fetcher.service.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js index 6f99616f..8e954cdf 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -19,6 +19,9 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false const args = { timeline, credentials } const rootState = store.rootState || store.state const timelineData = rootState.statuses.timelines[camelCase(timeline)] + const hideMutedPosts = typeof rootState.config.hideMutedPosts === 'undefined' + ? rootState.instance.hideMutedPosts + : rootState.config.hideMutedPosts if (older) { args['until'] = until || timelineData.minId @@ -28,6 +31,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false args['userId'] = userId args['tag'] = tag + args['withMuted'] = !hideMutedPosts const numStatusesBeforeFetch = timelineData.statuses.length |