diff options
author | Joas Schilling <coding@schilljs.com> | 2022-03-25 17:04:28 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2022-03-25 17:04:28 +0300 |
commit | d93253a55e804b12cdee967d8d1165050aa36359 (patch) | |
tree | 63a3afbcea7a0e939ff39c2e0cbe92d9d06e72af | |
parent | 61ac589e4c8d09cde4b44b04a89e0146c336cd87 (diff) |
Allow to react to file and object sharesfeature/noid/allow-to-react-to-object_shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | lib/Chat/ReactionManager.php | 5 | ||||
-rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue | 2 | ||||
-rw-r--r-- | src/store/messagesStore.js | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/lib/Chat/ReactionManager.php b/lib/Chat/ReactionManager.php index 799e1de52..e90b85017 100644 --- a/lib/Chat/ReactionManager.php +++ b/lib/Chat/ReactionManager.php @@ -190,7 +190,10 @@ class ReactionManager { if ($comment->getObjectType() !== 'chat' || $comment->getObjectId() !== (string) $chat->getId() - || $comment->getVerb() !== 'comment') { + || !in_array($comment->getVerb(), [ + 'comment', + 'object_shared', + ], true)) { throw new ReactionOutOfContextException(); } diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue index 04b86d19d..e81035a81 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue @@ -323,7 +323,7 @@ export default { }, acceptsReactions() { - return !this.isConversationReadOnly && !this.isFileShare + return !this.isConversationReadOnly }, messageActions() { diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js index 3dd4833d3..46346b428 100644 --- a/src/store/messagesStore.js +++ b/src/store/messagesStore.js @@ -994,7 +994,8 @@ const actions = { messageId, reaction: selectedEmoji, }) - console.debug(error) + console.error(error) + showError(t('spreed', 'Failed to add reaction')) } }, @@ -1027,7 +1028,8 @@ const actions = { messageId, reaction: selectedEmoji, }) - console.debug(error) + console.error(error) + showError(t('spreed', 'Failed to remove reaction')) } }, } |