refetch favs and repeats separately
This commit is contained in:
parent
e9b6e0e2b7
commit
ab4d7d9616
|
@ -402,9 +402,6 @@ const Status = {
|
||||||
setMedia () {
|
setMedia () {
|
||||||
const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
|
const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
|
||||||
return () => this.$store.dispatch('setMedia', attachments)
|
return () => this.$store.dispatch('setMedia', attachments)
|
||||||
},
|
|
||||||
refetchFavsAndRepeats () {
|
|
||||||
this.$store.dispatch('fetchFavsAndRepeats', this.status.id)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -425,12 +422,12 @@ const Status = {
|
||||||
},
|
},
|
||||||
'status.repeat_num': function (num) {
|
'status.repeat_num': function (num) {
|
||||||
if (this.isFocused && this.statusFromGlobalRepository.rebloggedBy && this.statusFromGlobalRepository.rebloggedBy.length !== num) {
|
if (this.isFocused && this.statusFromGlobalRepository.rebloggedBy && this.statusFromGlobalRepository.rebloggedBy.length !== num) {
|
||||||
this.refetchFavsAndRepeats()
|
this.$store.dispatch('fetchRepeats', this.status.id)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'status.fave_num': function (num) {
|
'status.fave_num': function (num) {
|
||||||
if (this.isFocused && this.statusFromGlobalRepository.favoritedBy && this.statusFromGlobalRepository.favoritedBy.length !== num) {
|
if (this.isFocused && this.statusFromGlobalRepository.favoritedBy && this.statusFromGlobalRepository.favoritedBy.length !== num) {
|
||||||
this.refetchFavsAndRepeats()
|
this.$store.dispatch('fetchFavs', this.status.id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -492,15 +492,19 @@ export const mutations = {
|
||||||
queueFlush (state, { timeline, id }) {
|
queueFlush (state, { timeline, id }) {
|
||||||
state.timelines[timeline].flushMarker = id
|
state.timelines[timeline].flushMarker = id
|
||||||
},
|
},
|
||||||
addFavsAndRepeats (state, { id, favoritedByUsers, rebloggedByUsers, currentUser }) {
|
addRepeats (state, { id, rebloggedByUsers, currentUser }) {
|
||||||
|
const newStatus = state.allStatusesObject[id]
|
||||||
|
newStatus.rebloggedBy = rebloggedByUsers.filter(_ => _)
|
||||||
|
// repeats stats can be incorrect based on polling condition, let's update them using the most recent data
|
||||||
|
newStatus.repeat_num = newStatus.rebloggedBy.length
|
||||||
|
newStatus.repeated = !!newStatus.rebloggedBy.find(({ id }) => currentUser.id === id)
|
||||||
|
},
|
||||||
|
addFavs (state, { id, favoritedByUsers, currentUser }) {
|
||||||
const newStatus = state.allStatusesObject[id]
|
const newStatus = state.allStatusesObject[id]
|
||||||
newStatus.favoritedBy = favoritedByUsers.filter(_ => _)
|
newStatus.favoritedBy = favoritedByUsers.filter(_ => _)
|
||||||
newStatus.rebloggedBy = rebloggedByUsers.filter(_ => _)
|
// favorites stats can be incorrect based on polling condition, let's update them using the most recent data
|
||||||
// favorites and repeats stats can be incorrect based on polling condition, let's update them using the most recent data
|
|
||||||
newStatus.fave_num = newStatus.favoritedBy.length
|
newStatus.fave_num = newStatus.favoritedBy.length
|
||||||
newStatus.repeat_num = newStatus.rebloggedBy.length
|
|
||||||
newStatus.favorited = !!newStatus.favoritedBy.find(({ id }) => currentUser.id === id)
|
newStatus.favorited = !!newStatus.favoritedBy.find(({ id }) => currentUser.id === id)
|
||||||
newStatus.repeated = !!newStatus.rebloggedBy.find(({ id }) => currentUser.id === id)
|
|
||||||
},
|
},
|
||||||
updateStatusWithPoll (state, { id, poll }) {
|
updateStatusWithPoll (state, { id, poll }) {
|
||||||
const status = state.allStatusesObject[id]
|
const status = state.allStatusesObject[id]
|
||||||
|
@ -586,9 +590,18 @@ const statuses = {
|
||||||
Promise.all([
|
Promise.all([
|
||||||
rootState.api.backendInteractor.fetchFavoritedByUsers(id),
|
rootState.api.backendInteractor.fetchFavoritedByUsers(id),
|
||||||
rootState.api.backendInteractor.fetchRebloggedByUsers(id)
|
rootState.api.backendInteractor.fetchRebloggedByUsers(id)
|
||||||
]).then(([favoritedByUsers, rebloggedByUsers]) =>
|
]).then(([favoritedByUsers, rebloggedByUsers]) => {
|
||||||
commit('addFavsAndRepeats', { id, favoritedByUsers, rebloggedByUsers, currentUser: rootState.users.currentUser })
|
commit('addFavs', { id, favoritedByUsers, currentUser: rootState.users.currentUser })
|
||||||
)
|
commit('addRepeats', { id, rebloggedByUsers, currentUser: rootState.users.currentUser })
|
||||||
|
})
|
||||||
|
},
|
||||||
|
fetchFavs ({ rootState, commit }, id) {
|
||||||
|
rootState.api.backendInteractor.fetchFavoritedByUsers(id)
|
||||||
|
.then(favoritedByUsers => commit('addFavs', { id, favoritedByUsers, currentUser: rootState.users.currentUser }))
|
||||||
|
},
|
||||||
|
fetchRepeats ({ rootState, commit }, id) {
|
||||||
|
rootState.api.backendInteractor.fetchRebloggedByUsers(id)
|
||||||
|
.then(rebloggedByUsers => commit('addRepeats', { id, rebloggedByUsers, currentUser: rootState.users.currentUser }))
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mutations
|
mutations
|
||||||
|
|
Loading…
Reference in New Issue