diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-24 23:04:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-24 23:04:36 +0000 |
| commit | 673f0fca3f7898641cdc488e6e6cc9033ca51777 (patch) | |
| tree | a92128b2779b3971d15699b4410c37687446d480 /src/services/timeline_fetcher/timeline_fetcher.service.js | |
| parent | 55650ff7ea9867cdb8adf7077b36bbb8c7bfcb75 (diff) | |
| parent | fe906cc3f0c8388bcb2a33be9c72ca5365bde0a5 (diff) | |
Merge branch 'notifications' into 'develop'
Support qvitter api notifications
Closes #129
See merge request pleroma/pleroma-fe!306
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, 2 insertions, 2 deletions
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js index bb5fdc2e..0e3e32d2 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -14,13 +14,13 @@ const update = ({store, statuses, timeline, showImmediately}) => { }) } -const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false, showImmediately = false, userId = false, tag = false}) => { +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 timelineData = rootState.statuses.timelines[camelCase(timeline)] if (older) { - args['until'] = timelineData.minVisibleId + args['until'] = until || timelineData.minVisibleId } else { args['since'] = timelineData.maxId } |
