Merge branch 'tusooa/react-button-fix' into 'develop'
Fix react button not working if reaction accounts are not loaded See merge request pleroma/pleroma-fe!1837
This commit is contained in:
commit
5b93e4a0de
|
@ -0,0 +1 @@
|
||||||
|
Fix react button not working if reaction accounts are not loaded
|
|
@ -57,10 +57,10 @@ const EmojiReactions = {
|
||||||
reactedWith (emoji) {
|
reactedWith (emoji) {
|
||||||
return this.status.emoji_reactions.find(r => r.name === emoji).me
|
return this.status.emoji_reactions.find(r => r.name === emoji).me
|
||||||
},
|
},
|
||||||
fetchEmojiReactionsByIfMissing () {
|
async fetchEmojiReactionsByIfMissing () {
|
||||||
const hasNoAccounts = this.status.emoji_reactions.find(r => !r.accounts)
|
const hasNoAccounts = this.status.emoji_reactions.find(r => !r.accounts)
|
||||||
if (hasNoAccounts) {
|
if (hasNoAccounts) {
|
||||||
this.$store.dispatch('fetchEmojiReactionsBy', this.status.id)
|
return await this.$store.dispatch('fetchEmojiReactionsBy', this.status.id)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reactWith (emoji) {
|
reactWith (emoji) {
|
||||||
|
@ -69,9 +69,10 @@ const EmojiReactions = {
|
||||||
unreact (emoji) {
|
unreact (emoji) {
|
||||||
this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
|
this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
|
||||||
},
|
},
|
||||||
emojiOnClick (emoji, event) {
|
async emojiOnClick (emoji, event) {
|
||||||
if (!this.loggedIn) return
|
if (!this.loggedIn) return
|
||||||
|
|
||||||
|
await this.fetchEmojiReactionsByIfMissing()
|
||||||
if (this.reactedWith(emoji)) {
|
if (this.reactedWith(emoji)) {
|
||||||
this.unreact(emoji)
|
this.unreact(emoji)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -757,7 +757,7 @@ const statuses = {
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
fetchEmojiReactionsBy ({ rootState, commit }, id) {
|
fetchEmojiReactionsBy ({ rootState, commit }, id) {
|
||||||
rootState.api.backendInteractor.fetchEmojiReactions({ id }).then(
|
return rootState.api.backendInteractor.fetchEmojiReactions({ id }).then(
|
||||||
emojiReactions => {
|
emojiReactions => {
|
||||||
commit('addEmojiReactionsBy', { id, emojiReactions, currentUser: rootState.users.currentUser })
|
commit('addEmojiReactionsBy', { id, emojiReactions, currentUser: rootState.users.currentUser })
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue