From 832019b2c26f7b219db75e47060ab95251c14c26 Mon Sep 17 00:00:00 2001 From: Alexander Tumin Date: Thu, 2 Mar 2023 11:13:05 +0300 Subject: Hide custom emoji in reaction picker when BE does not advertise pleroma_custom_emoji_reactions --- src/components/emoji_picker/emoji_picker.js | 8 ++++++++ src/components/react_button/react_button.js | 4 ++-- src/components/react_button/react_button.vue | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src/components') diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index 0d7ca812..349b043d 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -98,6 +98,11 @@ const EmojiPicker = { required: false, type: Boolean, default: false + }, + hideCustomEmoji: { + required: false, + type: Boolean, + default: false } }, data () { @@ -280,6 +285,9 @@ const EmojiPicker = { return 0 }, allCustomGroups () { + if (this.hideCustomEmoji) { + return {} + } const emojis = this.$store.getters.groupedCustomEmojis if (emojis.unpacked) { emojis.unpacked.text = this.$t('emoji.unpacked') diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js index 11bee8b0..8eed4b60 100644 --- a/src/components/react_button/react_button.js +++ b/src/components/react_button/react_button.js @@ -45,8 +45,8 @@ const ReactButton = { } }, computed: { - mergedConfig () { - return this.$store.getters.mergedConfig + hideCustomEmoji () { + return !this.$store.state.instance.pleromaChatMessagesAvailable } } } diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index de08dd4c..947536a1 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -3,6 +3,7 @@