diff --git a/assets/data/toolsNav.ts b/assets/data/toolsNav.ts index ae47aef4..1601d657 100644 --- a/assets/data/toolsNav.ts +++ b/assets/data/toolsNav.ts @@ -15,9 +15,9 @@ export default [ to: "/tools/avatar-decoration-preview/", }, { - i18n: "_aidConverter.title", - description: "_aidConverter.description", - to: "/tools/aid-converter/", + i18n: "_customEmojiPreview.title", + description: "_customEmojiPreview.description", + to: "/tools/custom-emoji-preview/", }, { i18n: "_shareLinkGenerator.title", @@ -26,4 +26,14 @@ export default [ }, ], }, + { + title: "_tools._forAdmin.title", + items: [ + { + i18n: "_aidConverter.title", + description: "_aidConverter.description", + to: "/tools/aid-converter/", + }, + ], + } ]; \ No newline at end of file diff --git a/components/mk/CustomEmoji.vue b/components/mk/CustomEmoji.vue index 585aa15a..aaf5fd54 100644 --- a/components/mk/CustomEmoji.vue +++ b/components/mk/CustomEmoji.vue @@ -38,6 +38,10 @@ const rawUrl = computed(() => { const url = computed(() => { if (rawUrl.value == null) return null; + if (props.url) { + return rawUrl.value; + } + const proxied = (rawUrl.value.startsWith('/emoji/') || (props.useOriginalSize && isLocal.value)) ? parseURL(rawUrl.value).host ? rawUrl.value : 'https://misskey.io' + rawUrl.value @@ -51,7 +55,7 @@ const url = computed(() => { }); const alt = computed(() => `:${customEmojiName.value}:`); -const errored = ref(props.host == null); +const errored = ref(props.host == null && !props.url);