diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-11-29 14:56:11 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-11-29 14:56:11 +0000 |
| commit | e41edd1bbfa0118a09a49753a39f5a67d48cd5b8 (patch) | |
| tree | 5974b9436e20defdbaf65f5606109ad2525654dc | |
| parent | 6175a153ed4e5eb30fd4b5d5f6b3fff34a81a89c (diff) | |
| parent | 4b252ea8d3bf672a8eaa5abd7dcb866e47273df7 (diff) | |
Merge branch 'from/develop/tusooa/fix-fetchTimeline' into 'develop'
Fix fetchTimeline error
See merge request pleroma/pleroma-fe!1688
| -rw-r--r-- | src/modules/api.js | 2 | ||||
| -rw-r--r-- | src/modules/users.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/api.js b/src/modules/api.js index 0acc03f1..fee584e8 100644 --- a/src/modules/api.js +++ b/src/modules/api.js @@ -216,7 +216,7 @@ const api = { if (!fetcher) return store.commit('removeFetcher', { fetcherName: timeline, fetcher }) }, - fetchTimeline (store, timeline, { ...rest }) { + fetchTimeline (store, { timeline, ...rest }) { store.state.backendInteractor.fetchTimeline({ store, timeline, diff --git a/src/modules/users.js b/src/modules/users.js index eef87c2c..10b4603f 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -588,7 +588,7 @@ const users = { } if (store.getters.mergedConfig.useStreamingApi) { - store.dispatch('fetchTimeline', 'friends', { since: null }) + store.dispatch('fetchTimeline', { timeline: 'friends', since: null }) store.dispatch('fetchNotifications', { since: null }) store.dispatch('enableMastoSockets', true).catch((error) => { console.error('Failed initializing MastoAPI Streaming socket', error) |