diff options
| author | Marco <marcoambrosini@pm.me> | 2022-03-29 15:31:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 15:31:49 +0300 |
| commit | 95001fd9a5103775ca7e425dfd87c72047f406ed (patch) | |
| tree | a1a263cbc267d54017888bb00c74e75a0209c3b5 /src | |
| parent | 16d3ac179ed06f9ee0f22a17895a4ae5b149e7c4 (diff) | |
| parent | 19a6916d0d18ba59f62dddc9cf905fa993465436 (diff) | |
Merge pull request #7061 from nextcloud/bugfix/noid/fix-user-has-reacted
Fix detection if the user (not author) reacted already
Diffstat (limited to 'src')
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 084ce9fe2..08eeff71b 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -656,7 +656,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 e81035a81..cbfabbd5e 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 }, } |