diff options
| author | Henry Jameson <me@hjkos.com> | 2019-10-06 23:28:30 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-10-06 23:28:30 +0300 |
| commit | 0be86304d24a5f11a64e9120c8ae1ce9121e64e8 (patch) | |
| tree | a3cf63d86868a80ce1aa3ad2e6cb8cd932885b02 /src/services/timeline_fetcher/timeline_fetcher.service.js | |
| parent | 20fc259350b6bc9163899b859b496b86cf0083c5 (diff) | |
Fix tests, more replacing with mergedConfig
Diffstat (limited to 'src/services/timeline_fetcher/timeline_fetcher.service.js')
| -rw-r--r-- | src/services/timeline_fetcher/timeline_fetcher.service.js | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js index f72688f8..9eb30c2d 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -15,13 +15,21 @@ const update = ({ store, statuses, timeline, showImmediately, userId }) => { }) } -const fetchAndUpdate = ({ store, credentials, timeline = 'friends', older = false, showImmediately = false, userId = false, tag = false, until }) => { +const fetchAndUpdate = ({ + store, + credentials, + timeline = 'friends', + older = false, + showImmediately = false, + userId = false, + tag = false, + until +}) => { const args = { timeline, credentials } const rootState = store.rootState || store.state + const { getters } = store const timelineData = rootState.statuses.timelines[camelCase(timeline)] - const hideMutedPosts = typeof rootState.config.hideMutedPosts === 'undefined' - ? rootState.instance.hideMutedPosts - : rootState.config.hideMutedPosts + const hideMutedPosts = getters.mergedConfig.hideMutedPosts if (older) { args['until'] = until || timelineData.minId |
