diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-07-05 13:28:15 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-07-05 13:28:15 +0000 |
| commit | 60b413d02c4be5b3f24ff984e43090620d9a59e1 (patch) | |
| tree | deea313b0182c1a6dbfed0e739d70042cac58e5a /src/modules/statuses.js | |
| parent | 7ec02445cc9115b35f399b5c98bdcad00c6da5f4 (diff) | |
| parent | d8e210df4d3f6e83c1fa0fc9b893b825cec45da4 (diff) | |
Merge branch '602' into 'develop'
Fix mixed profiles bug on user profile page
Closes #586
See merge request pleroma/pleroma-fe!865
Diffstat (limited to 'src/modules/statuses.js')
| -rw-r--r-- | src/modules/statuses.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js index 9b11a13e..e58a9b4c 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -395,8 +395,9 @@ export const mutations = { state[key] = value }) }, - clearTimeline (state, { timeline }) { - state.timelines[timeline] = emptyTl(state.timelines[timeline].userId) + clearTimeline (state, { timeline, excludeUserId = false }) { + const userId = excludeUserId ? state.timelines[timeline].userId : undefined + state.timelines[timeline] = emptyTl(userId) }, clearNotifications (state) { state.notifications = emptyNotifications() |
