summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components/MkAutocomplete.vue
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2022-12-30 13:02:18 +0900
committerGitHub <noreply@github.com>2022-12-30 13:02:18 +0900
commit87a0ed8b46046a1f0121f58e724980f6dee5db37 (patch)
tree975d4f0273fc88ecbef84fafe2c471230b83c5e1 /packages/frontend/src/components/MkAutocomplete.vue
parent13.0.0-beta.8 (diff)
downloadsharkey-87a0ed8b46046a1f0121f58e724980f6dee5db37.tar.gz
sharkey-87a0ed8b46046a1f0121f58e724980f6dee5db37.tar.bz2
sharkey-87a0ed8b46046a1f0121f58e724980f6dee5db37.zip
fix(client): add sanitize-html to MkAutocomplete (#9433)
* fix(server): /emoji to accept `@.` host expression * fix(client): use MkEmoji for custom emoji in MkEmojiPicker * change convertToWebp * nanka iroiro * remove * fix * nearLosslessは労多くして益少なしなのでやめる * do not cleanup tmp for development * update sharp.js to 0.31.3 * mixed: true * fix MkAutocomplete of 912791b3ab * clean up * https://github.com/misskey-dev/misskey/pull/9431#discussion_r1059215943 * edit mkautocomplete.vue use sanitize-html * fix package.json
Diffstat (limited to 'packages/frontend/src/components/MkAutocomplete.vue')
-rw-r--r--packages/frontend/src/components/MkAutocomplete.vue10
1 files changed, 9 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index d150436fb2..40e9c25266 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -21,7 +21,8 @@
<MkEmoji :emoji="emoji.emoji" />
</div>
<!-- eslint-disable-next-line vue/no-v-html -->
- <span class="name" v-html="emoji.name.replace(q ?? '', `<b>${q}</b>`)"></span>
+ <span v-if="q" class="name" v-html="sanitizeHtml(emoji.name.replace(q, `<b>${q}</b>`))"></span>
+ <span v-else v-text="emoji.name"></span>
<span v-if="emoji.aliasOf" class="alias">({{ emoji.aliasOf }})</span>
</li>
</ol>
@@ -44,6 +45,7 @@ import { defaultStore } from '@/store';
import { emojilist } from '@/scripts/emojilist';
import { instance } from '@/instance';
import { i18n } from '@/i18n';
+import * as sanitizeHtml from 'sanitize-html';
type EmojiDef = {
emoji: string;
@@ -453,6 +455,7 @@ onBeforeUnmount(() => {
> .emojis > li {
.emoji {
+ flex-shrink: 0;
display: flex;
margin: 0 4px 0 0;
height: 24px;
@@ -469,7 +472,12 @@ onBeforeUnmount(() => {
}
+ .name {
+ flex-shrink: 1;
+ }
+
.alias {
+ flex-shrink: 9999999;
margin: 0 0 0 8px;
}
}