diff options
author | Joas Schilling <coding@schilljs.com> | 2022-03-25 17:45:20 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2022-03-25 17:45:20 +0300 |
commit | 3b48683aaccff527ec9feb904c3300cfb34dc6a9 (patch) | |
tree | 55a946c4c48dc8f0030dd28698f8443c2e182963 | |
parent | 61ac589e4c8d09cde4b44b04a89e0146c336cd87 (diff) |
Fix detection if the user (not author) reacted alreadybugfix/noid/fix-user-has-reacted
Signed-off-by: Joas Schilling <coding@schilljs.com>
3 files changed, 4 insertions, 4 deletions
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index 0998c2d02..9119b15e1 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -658,7 +658,7 @@ export default { await this.getReactions() } // Check if current user has already added this reaction to the message - const currentUserHasReacted = this.$store.getters.userHasReacted(this.actorId, this.token, this.id, clickedEmoji) + const currentUserHasReacted = this.$store.getters.userHasReacted(this.$store.getters.getActorType(), this.$store.getters.getActorId(), this.token, this.id, clickedEmoji) if (!currentUserHasReacted) { this.$store.dispatch('addReactionToMessage', { diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue index 04b86d19d..88946fa8e 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue @@ -404,7 +404,7 @@ export default { handleReactionClick(selectedEmoji) { // Add reaction only if user hasn't reacted yet - if (!this.$store.getters.userHasReacted(this.actorId, this.token, this.messageObject.id, selectedEmoji)) { + if (!this.$store.getters.userHasReacted(this.$store.getters.getActorType(), this.$store.getters.getActorId(), this.token, this.messageObject.id, selectedEmoji)) { this.$store.dispatch('addReactionToMessage', { token: this.token, messageId: this.messageObject.id, diff --git a/src/store/reactionsStore.js b/src/store/reactionsStore.js index 821e6c60a..c9f1c67fc 100644 --- a/src/store/reactionsStore.js +++ b/src/store/reactionsStore.js @@ -42,12 +42,12 @@ const getters = { }, // Checks if a user has already reacted to a message with a particular reaction - userHasReacted: (state) => (actorId, token, messageId, reaction) => { + userHasReacted: (state) => (actorType, actorId, token, messageId, reaction) => { if (!state?.reactions?.[token]?.[messageId]?.[reaction]) { return false } return state?.reactions?.[token]?.[messageId]?.[reaction].filter(item => { - return item.actorId === actorId + return item.actorType === actorType && item.actorId === actorId }).length !== 0 }, } |