usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug

This commit is contained in:
syuilo 2018-11-01 18:05:14 +09:00
parent e41f74e77c
commit 895cf53ee1
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app/common/views/components/autocomplete.vue
View File

@ -172,7 +172,7 @@ export default Vue.extend({
const matched = []; const matched = [];
const max = 30; const max = 30;
const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis; const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis || [];
customEmojis.some(x => { customEmojis.some(x => {
if (x.name.startsWith(this.q)) matched.push({ if (x.name.startsWith(this.q)) matched.push({
name: x.name, name: x.name,

2
src/client/app/common/views/components/misskey-flavored-markdown.ts
View File

@ -186,7 +186,7 @@ export default Vue.component('misskey-flavored-markdown', {
case 'emoji': { case 'emoji': {
//#region カスタム絵文字 //#region カスタム絵文字
const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis; const customEmojis = (this.os.getMetaSync() || { emojis: [] }).emojis || [];
const customEmoji = customEmojis.find(e => e.name == token.emoji || (e.aliases || []).includes(token.emoji)); const customEmoji = customEmojis.find(e => e.name == token.emoji || (e.aliases || []).includes(token.emoji));
if (customEmoji) { if (customEmoji) {
return [createElement('img', { return [createElement('img', {