summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/components/global/emoji.vue8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/client/components/global/emoji.vue b/src/client/components/global/emoji.vue
index f4ebd5f3b3..f92e35c38f 100644
--- a/src/client/components/global/emoji.vue
+++ b/src/client/components/global/emoji.vue
@@ -27,8 +27,7 @@ export default defineComponent({
default: false
},
customEmojis: {
- required: false,
- default: () => []
+ required: false
},
isReaction: {
type: Boolean,
@@ -58,10 +57,7 @@ export default defineComponent({
},
ce() {
- let ce = [];
- if (this.customEmojis) ce = ce.concat(this.customEmojis);
- if (this.$instance && this.$instance.emojis) ce = ce.concat(this.$instance.emojis);
- return ce;
+ return this.customEmojis || this.$instance?.emojis || [];
}
},