Merge branch 'develop'

CHANGELOG.md

@@ -17,6 +17,11 @@ npm i -g ts-node
 npm run migrate
 ```
 
+11.20.3 (2019/06/10)
+--------------------
+### 🐛Fixes
+* 絵文字サジェストが動作しなくなっていた問題を修正
+
 11.20.2 (2019/06/10)
 --------------------
 ### 🐛Fixes

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.20.2",
+	"version": "11.20.3",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",

src/client/app/common/views/components/autocomplete.vue

@@ -19,7 +19,7 @@
 			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else>{{ emoji.emoji }}</span>
-			<span class="name">{{ beforeQ }}<b>{{ q }}</b>{{ afterQ }}</span>
+			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
 			<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
 		</li>
 	</ol>
@@ -89,14 +89,6 @@ export default Vue.extend({
 	},
 
 	computed: {
-		beforeQ(): string {
-			return this.emoji.name.split(this.q)[0];
-		},
-
-		afterQ(): string {
-			return this.emoji.name.split(this.q)[1] || '';
-		},
-
 		items(): HTMLCollection {
 			return (this.$refs.suggests as Element).children;
 		},