diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2021-10-21 23:57:11 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-21 23:57:11 +0900 |
| commit | e7660bc8db66724b486f37f421cd56ce181d5111 (patch) | |
| tree | db9aa268b1872151904ba36ddb1fd91d44905cc0 /src | |
| parent | ドキュメントをmisskey-hubに移管 (diff) | |
| download | sharkey-e7660bc8db66724b486f37f421cd56ce181d5111.tar.gz sharkey-e7660bc8db66724b486f37f421cd56ce181d5111.tar.bz2 sharkey-e7660bc8db66724b486f37f421cd56ce181d5111.zip | |
リモートノートで意図せずローカルカスタム絵文字が使われてしまうことがあるのを修正 (#7889)
* 意図せずローカルカスタム絵文字が使われてしまうのを修正
* CHANGELOG
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/components/global/emoji.vue | 8 |
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 || []; } }, |