From e4c2bba89a61280137c1dda2a4e72f8139346b92 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 8 Dec 2022 17:33:04 +0900
Subject: [PATCH] fix(client): use proxied image for instance icon

---
 packages/client/assets/dummy.png                 | Bin 0 -> 6285 bytes
 .../src/ui/_common_/statusbar-federation.vue     |   7 ++++++-
 packages/client/src/widgets/federation.vue       |   7 ++++++-
 packages/client/src/widgets/instance-cloud.vue   |   7 ++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 packages/client/assets/dummy.png

diff --git a/packages/client/assets/dummy.png b/packages/client/assets/dummy.png
new file mode 100644
index 0000000000000000000000000000000000000000..39332b0c1beeda1edb90d78d25c16e7372aff030
GIT binary patch
literal 6285
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

literal 0
HcmV?d00001

diff --git a/packages/client/src/ui/_common_/statusbar-federation.vue b/packages/client/src/ui/_common_/statusbar-federation.vue
index 7d4f0d6166..24fc4f6f6d 100644
--- a/packages/client/src/ui/_common_/statusbar-federation.vue
+++ b/packages/client/src/ui/_common_/statusbar-federation.vue
@@ -4,7 +4,7 @@
 		<transition name="change" mode="default">
 			<MarqueeText :key="key" :duration="marqueeDuration" :reverse="marqueeReverse">
 				<span v-for="instance in instances" :key="instance.id" class="item" :class="{ colored }" :style="{ background: colored ? instance.themeColor : null }">
-					<img v-if="instance.iconUrl" class="icon" :src="instance.iconUrl" alt=""/>
+					<img class="icon" :src="getInstanceIcon(instance)" alt=""/>
 					<MkA :to="`/instance-info/${instance.host}`" class="host _monospace">
 						{{ instance.host }}
 					</MkA>
@@ -27,6 +27,7 @@ import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { getNoteSummary } from '@/scripts/get-note-summary';
 import { notePage } from '@/filters/note';
+import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
 
 const props = defineProps<{
 	display?: 'marquee' | 'oneByOne';
@@ -56,6 +57,10 @@ useInterval(tick, Math.max(5000, props.refreshIntervalSec * 1000), {
 	immediate: true,
 	afterMounted: true,
 });
+
+function getInstanceIcon(instance): string {
+	return getProxiedImageUrlNullable(instance.iconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? '/client-assets/dummy.png';
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/widgets/federation.vue b/packages/client/src/widgets/federation.vue
index e07cab5bfa..d0f81c1356 100644
--- a/packages/client/src/widgets/federation.vue
+++ b/packages/client/src/widgets/federation.vue
@@ -6,7 +6,7 @@
 		<MkLoading v-if="fetching"/>
 		<transition-group v-else tag="div" :name="$store.state.animation ? 'chart' : ''" class="instances">
 			<div v-for="(instance, i) in instances" :key="instance.id" class="instance">
-				<img v-if="instance.iconUrl" :src="instance.iconUrl" alt=""/>
+				<img :src="getInstanceIcon(instance)" alt=""/>
 				<div class="body">
 					<a class="a" :href="'https://' + instance.host" target="_blank" :title="instance.host">{{ instance.host }}</a>
 					<p>{{ instance.softwareName || '?' }} {{ instance.softwareVersion }}</p>
@@ -27,6 +27,7 @@ import MkMiniChart from '@/components/MkMiniChart.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
 import { i18n } from '@/i18n';
+import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
 
 const name = 'federation';
 
@@ -71,6 +72,10 @@ useInterval(fetch, 1000 * 60, {
 	afterMounted: true,
 });
 
+function getInstanceIcon(instance): string {
+	return getProxiedImageUrlNullable(instance.iconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? '/client-assets/dummy.png';
+}
+
 defineExpose<WidgetComponentExpose>({
 	name,
 	configure,
diff --git a/packages/client/src/widgets/instance-cloud.vue b/packages/client/src/widgets/instance-cloud.vue
index f8e463ee33..4965616995 100644
--- a/packages/client/src/widgets/instance-cloud.vue
+++ b/packages/client/src/widgets/instance-cloud.vue
@@ -4,7 +4,7 @@
 		<MkTagCloud v-if="activeInstances">
 			<li v-for="instance in activeInstances" :key="instance.id">
 				<a @click.prevent="onInstanceClick(instance)">
-					<img style="width: 32px;" :src="instance.iconUrl">
+					<img style="width: 32px;" :src="getInstanceIcon(instance)">
 				</a>
 			</li>
 		</MkTagCloud>
@@ -20,6 +20,7 @@ import MkContainer from '@/components/MkContainer.vue';
 import MkTagCloud from '@/components/MkTagCloud.vue';
 import * as os from '@/os';
 import { useInterval } from '@/scripts/use-interval';
+import { getProxiedImageUrlNullable } from '@/scripts/media-proxy';
 
 const name = 'instanceCloud';
 
@@ -64,6 +65,10 @@ useInterval(() => {
 	afterMounted: true,
 });
 
+function getInstanceIcon(instance): string {
+	return getProxiedImageUrlNullable(instance.iconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? '/client-assets/dummy.png';
+}
+
 defineExpose<WidgetComponentExpose>({
 	name,
 	configure,