diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-11-12 09:39:11 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-11-12 09:39:11 +0900 |
| commit | 1f3b1e7074c78a87ee3e7e089f8c1d2eeb2f2a49 (patch) | |
| tree | cca3fbf1db56b9fa2a269b28f01b289b06cd3b2b /packages/client/src/components/MkInstanceTicker.vue | |
| parent | Update QueueProcessorService.ts (diff) | |
| download | misskey-1f3b1e7074c78a87ee3e7e089f8c1d2eeb2f2a49.tar.gz misskey-1f3b1e7074c78a87ee3e7e089f8c1d2eeb2f2a49.tar.bz2 misskey-1f3b1e7074c78a87ee3e7e089f8c1d2eeb2f2a49.zip | |
fix(client): インスタンスティッカーのfaviconを読み込む際に偽サイト警告が出ることがあるのを修正
Diffstat (limited to 'packages/client/src/components/MkInstanceTicker.vue')
| -rw-r--r-- | packages/client/src/components/MkInstanceTicker.vue | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/client/src/components/MkInstanceTicker.vue b/packages/client/src/components/MkInstanceTicker.vue index d9f196f887..a5ff656f6d 100644 --- a/packages/client/src/components/MkInstanceTicker.vue +++ b/packages/client/src/components/MkInstanceTicker.vue @@ -9,6 +9,7 @@ import { } from 'vue'; import { instanceName } from '@/config'; import { instance as Instance } from '@/instance'; +import { getProxiedImageUrlNullable } from '@/scripts/media-proxy'; const props = defineProps<{ instance?: { @@ -20,15 +21,15 @@ const props = defineProps<{ // if no instance data is given, this is for the local instance const instance = props.instance ?? { - faviconUrl: Instance.iconUrl || Instance.faviconUrl || '/favicon.ico', + faviconUrl: getProxiedImageUrlNullable(Instance.iconUrl) ?? getProxiedImageUrlNullable(Instance.faviconUrl) ?? '/favicon.ico', name: instanceName, - themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement)?.content + themeColor: (document.querySelector('meta[name="theme-color-orig"]') as HTMLMetaElement).content, }; const themeColor = instance.themeColor ?? '#777777'; const bg = { - background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)` + background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)`, }; </script> |