commit: bb8e2b193342032c2c73b3d7bf1f1ac703afaae1
parent: 05aec11906c136a79b8661ec13b10668a5b6e2bf
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Mon, 24 Jun 2019 22:08:09 +0000
Merge branch 'timeline-skip-fix' into 'develop'
timeline-skip-fix
See merge request pleroma/pleroma-fe!850
Diffstat:
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
@@ -146,7 +146,8 @@ const removeStatusFromGlobalStorage = (state, status) => {
}
}
-const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {}, noIdUpdate = false, userId }) => {
+const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {},
+ noIdUpdate = false, userId }) => {
// Sanity check
if (!isArray(statuses)) {
return false
@@ -543,7 +544,7 @@ const statuses = {
},
fetchPinnedStatuses ({ rootState, dispatch }, userId) {
rootState.api.backendInteractor.fetchPinnedStatuses(userId)
- .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId, showImmediately: true }))
+ .then(statuses => dispatch('addNewStatuses', { statuses, timeline: 'user', userId, showImmediately: true, noIdUpdate: true }))
},
pinStatus ({ rootState, commit }, statusId) {
return rootState.api.backendInteractor.pinOwnStatus(statusId)