profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

リモートノートで意図せずローカルカスタム絵文字が使われてしまうことがあるのを修正 (#7889)

Browse source 
* 意図せずローカルカスタム絵文字が使われてしまうのを修正

* CHANGELOG

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
MeiMei 2021-10-21 23:57:11 +09:00 • committed by GitHub
parent cfcc626de2
commit e7660bc8db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client/components/global/emoji.vue
View file

@ -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 || [];
}
},