From 50d09a4c663cfbc5e147f840098d68c049566ed2 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Thu, 31 Aug 2023 01:09:20 +0200
Subject: [PATCH] Switch to emoji status images (related: #42)

---
 packages/backend/src/config/load.ts                   |  7 +++++++
 packages/backend/src/config/types.ts                  |  6 ++++++
 .../src/server/api/endpoints/admin/send-mod-mail.ts   |  3 ++-
 packages/backend/src/server/api/endpoints/meta.ts     | 11 +++++++++++
 packages/backend/src/server/web/views/base.pug        |  6 +++---
 packages/client/src/components/MkChannelList.vue      |  3 ++-
 packages/client/src/components/MkNotes.vue            |  3 ++-
 packages/client/src/components/MkNotifications.vue    |  3 ++-
 packages/client/src/components/MkPagination.vue       |  3 ++-
 packages/client/src/components/MkUserList.vue         |  3 ++-
 packages/client/src/components/global/MkError.vue     |  3 ++-
 packages/client/src/pages/_error_.vue                 |  4 +++-
 packages/client/src/pages/favorites.vue               |  3 ++-
 packages/client/src/pages/follow-requests.vue         |  3 ++-
 .../client/src/pages/messaging/messaging-room.vue     |  3 ++-
 packages/client/src/pages/no-graze.vue                |  3 ++-
 packages/client/src/pages/not-found.vue               |  3 ++-
 packages/client/src/pages/search.vue                  |  3 ++-
 packages/client/src/pages/settings/apps.vue           |  3 ++-
 packages/iceshrimp-js/src/entities.ts                 |  5 +++++
 20 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/packages/backend/src/config/load.ts b/packages/backend/src/config/load.ts
index 38bee03bc..76e2153ba 100644
--- a/packages/backend/src/config/load.ts
+++ b/packages/backend/src/config/load.ts
@@ -44,6 +44,13 @@ export default function load() {
 
 	config.port = config.port || parseInt(process.env.PORT || "", 10);
 
+	config.images = {
+		...config.images,
+		info: '/twemoji/1f440.svg',
+		notFound: '/twemoji/2049.svg',
+		error: '/twemoji/1f480.svg',
+	};
+
 	mixin.version = meta.version;
 	mixin.host = url.host;
 	mixin.hostname = url.hostname;
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index 89085bd1b..86167acf1 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -66,6 +66,12 @@ export type Source = {
 		keepHeaders?: boolean;
 	};
 
+	images?: {
+		error?: string;
+		notFound?: string;
+		info?: string;
+	};
+
 	proxy?: string;
 	proxySmtp?: string;
 	proxyBypassHosts?: string[];
diff --git a/packages/backend/src/server/api/endpoints/admin/send-mod-mail.ts b/packages/backend/src/server/api/endpoints/admin/send-mod-mail.ts
index f7a9ad778..82a1dc2de 100644
--- a/packages/backend/src/server/api/endpoints/admin/send-mod-mail.ts
+++ b/packages/backend/src/server/api/endpoints/admin/send-mod-mail.ts
@@ -4,6 +4,7 @@ import { Users, UserProfiles } from "@/models/index.js";
 import { ApiError } from "../../error.js";
 import { sendEmail } from "@/services/send-email.js";
 import { createNotification } from "@/services/create-notification.js";
+import config from "@/config/index.js";
 
 export const meta = {
 	tags: ["users"],
@@ -49,7 +50,7 @@ export default define(meta, paramDef, async (ps) => {
 	createNotification(user.id, "app", {
 		customBody: ps.comment,
 		customHeader: "Moderation Notice",
-		customIcon: "/static-assets/badges/info.png",
+		customIcon: config?.images?.info,
 	});
 
 	setImmediate(async () => {
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 40211ae55..36950c941 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -269,6 +269,15 @@ export const meta = {
 				optional: false,
 				nullable: true,
 			},
+			images: {
+				type: 'object',
+				optional: false, nullable: false,
+				properties: {
+					info: { type: 'string' },
+					notFound: { type: 'string' },
+					error: { type: 'string' },
+				},
+			},
 			features: {
 				type: "object",
 				optional: true,
@@ -441,6 +450,8 @@ export default define(meta, paramDef, async (ps, me) => {
 			? JSON.stringify(JSON5.parse(instance.defaultDarkTheme))
 			: null,
 
+		images: config.images,
+
 		enableEmail: instance.enableEmail,
 
 		enableTwitterIntegration: instance.enableTwitterIntegration,
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index 481641555..17f92d9f9 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -28,9 +28,9 @@ html
 		link(rel='icon' href= icon || `/favicon.ico?${ timestamp }`)
 		link(rel='apple-touch-icon' href= icon || `/apple-touch-icon.png?${ timestamp }`)
 		link(rel='manifest' href='/manifest.json')
-		link(rel='prefetch' href=`/static-assets/badges/info.png?${ timestamp }`)
-		link(rel='prefetch' href=`/static-assets/badges/not-found.png?${ timestamp }`)
-		link(rel='prefetch' href=`/static-assets/badges/error.png?${ timestamp }`)
+		link(rel='prefetch' href=config.images.info)
+		link(rel='prefetch' href=config.images.notFound)
+		link(rel='prefetch' href=config.images.error)
 		link(rel='stylesheet' href=`/static-assets/instance.css?${ timestamp }`)
 		link(rel='modulepreload' href=`/assets/${clientEntry.file}`)
 
diff --git a/packages/client/src/components/MkChannelList.vue b/packages/client/src/components/MkChannelList.vue
index 0861bf5a8..ff61ec7c6 100644
--- a/packages/client/src/components/MkChannelList.vue
+++ b/packages/client/src/components/MkChannelList.vue
@@ -3,7 +3,7 @@
 		<template #empty>
 			<div class="_fullinfo">
 				<img
-					src="/static-assets/badges/not-found.png"
+					:src="instance.images.notFound"
 					class="_ghost"
 					:alt="i18n.ts.notFound"
 				/>
@@ -27,6 +27,7 @@ import MkChannelPreview from "@/components/MkChannelPreview.vue";
 import type { Paging } from "@/components/MkPagination.vue";
 import MkPagination from "@/components/MkPagination.vue";
 import { i18n } from "@/i18n";
+import {instance} from "@/instance";
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/client/src/components/MkNotes.vue b/packages/client/src/components/MkNotes.vue
index c40221933..d7be5066d 100644
--- a/packages/client/src/components/MkNotes.vue
+++ b/packages/client/src/components/MkNotes.vue
@@ -3,7 +3,7 @@
 		<template #empty>
 			<div class="_fullinfo">
 				<img
-					src="/static-assets/badges/info.png"
+					:src="instance.images.info"
 					class="_ghost"
 					alt="Info"
 				/>
@@ -41,6 +41,7 @@ import XList from "@/components/MkDateSeparatedList.vue";
 import MkPagination from "@/components/MkPagination.vue";
 import { i18n } from "@/i18n";
 import { scroll } from "@/scripts/scroll";
+import {instance} from "@/instance";
 
 const tlEl = ref<HTMLElement>();
 
diff --git a/packages/client/src/components/MkNotifications.vue b/packages/client/src/components/MkNotifications.vue
index 453d9adc2..4ba2725b1 100644
--- a/packages/client/src/components/MkNotifications.vue
+++ b/packages/client/src/components/MkNotifications.vue
@@ -3,7 +3,7 @@
 		<template #empty>
 			<div class="_fullinfo">
 				<img
-					src="/static-assets/badges/info.png"
+					:src="instance.images.info"
 					class="_ghost"
 					alt="Info"
 				/>
@@ -63,6 +63,7 @@ import * as os from "@/os";
 import { stream } from "@/stream";
 import { $i } from "@/account";
 import { i18n } from "@/i18n";
+import {instance} from "@/instance";
 
 const props = defineProps<{
 	includeTypes?: (typeof notificationTypes)[number][];
diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue
index a49f8fe76..a3a82e230 100644
--- a/packages/client/src/components/MkPagination.vue
+++ b/packages/client/src/components/MkPagination.vue
@@ -8,7 +8,7 @@
 			<slot name="empty">
 				<div class="_fullinfo">
 					<img
-						src="/static-assets/badges/info.png"
+						:src="instance.images.info"
 						class="_ghost"
 						alt="Error"
 					/>
@@ -84,6 +84,7 @@ import {
 } from "@/scripts/scroll";
 import MkButton from "@/components/MkButton.vue";
 import { i18n } from "@/i18n";
+import {instance} from "@/instance";
 
 export type Paging<
 	E extends keyof misskey.Endpoints = keyof misskey.Endpoints,
diff --git a/packages/client/src/components/MkUserList.vue b/packages/client/src/components/MkUserList.vue
index 99815e46e..0ea2739b5 100644
--- a/packages/client/src/components/MkUserList.vue
+++ b/packages/client/src/components/MkUserList.vue
@@ -3,7 +3,7 @@
 		<template #empty>
 			<div class="_fullinfo">
 				<img
-					src="/static-assets/badges/info.png"
+					:src="instance.images.info"
 					class="_ghost"
 					alt="Info"
 				/>
@@ -30,6 +30,7 @@ import MkUserInfo from "@/components/MkUserInfo.vue";
 import MkPagination, { Paging } from "@/components/MkPagination.vue";
 import { userPage } from "@/filters/user";
 import { i18n } from "@/i18n";
+import {instance} from "@/instance";
 
 const props = defineProps<{
 	pagination: Paging;
diff --git a/packages/client/src/components/global/MkError.vue b/packages/client/src/components/global/MkError.vue
index 38d6244b9..77745d017 100644
--- a/packages/client/src/components/global/MkError.vue
+++ b/packages/client/src/components/global/MkError.vue
@@ -2,7 +2,7 @@
 	<transition :name="$store.state.animation ? 'zoom' : ''" appear>
 		<div class="mjndxjcg">
 			<img
-				src="/static-assets/badges/error.png"
+				:src="instance.images.error"
 				class="_ghost"
 				alt="Error"
 			/>
@@ -20,6 +20,7 @@
 <script lang="ts" setup>
 import MkButton from "@/components/MkButton.vue";
 import { i18n } from "@/i18n";
+import { instance } from "@/instance";
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/_error_.vue b/packages/client/src/pages/_error_.vue
index 93691f4b7..4f536c2b5 100644
--- a/packages/client/src/pages/_error_.vue
+++ b/packages/client/src/pages/_error_.vue
@@ -3,7 +3,7 @@
 	<transition :name="$store.state.animation ? 'zoom' : ''" appear>
 		<div v-show="loaded" class="mjndxjch">
 			<img
-				src="/static-assets/badges/error.png"
+				:src="instance.images.error"
 				class="_ghost"
 				alt="Error"
 			/>
@@ -43,6 +43,8 @@ import * as os from "@/os";
 import { unisonReload } from "@/scripts/unison-reload";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import { instance } from "@/instance";
+
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue
index bed79909f..1b8e53e28 100644
--- a/packages/client/src/pages/favorites.vue
+++ b/packages/client/src/pages/favorites.vue
@@ -6,7 +6,7 @@
 				<template #empty>
 					<div class="_fullinfo">
 						<img
-							src="/static-assets/badges/info.png"
+							:src="instance.images.info"
 							class="_ghost"
 							alt="Info"
 						/>
@@ -40,6 +40,7 @@ import XNote from "@/components/MkNote.vue";
 import XList from "@/components/MkDateSeparatedList.vue";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import {instance} from "@/instance";
 
 const pagination = {
 	endpoint: "i/favorites" as const,
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index d6afcf456..6e0184f5b 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -6,7 +6,7 @@
 				<template #empty>
 					<div class="_fullinfo">
 						<img
-							src="/static-assets/badges/info.png"
+							:src="instance.images.info"
 							aria-label="none"
 							class="_ghost"
 						/>
@@ -89,6 +89,7 @@ import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { $i } from "@/account";
+import {instance} from "@/instance";
 
 const paginationComponent = ref<InstanceType<typeof MkPagination>>();
 
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 726bf2feb..a360863f2 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -17,7 +17,7 @@
 						<template #empty>
 							<div class="_fullinfo">
 								<img
-									src="/static-assets/badges/info.png"
+									:src="instance.images.info"
 									class="_ghost"
 									alt="Info"
 								/>
@@ -116,6 +116,7 @@ import { i18n } from "@/i18n";
 import { $i } from "@/account";
 import { defaultStore } from "@/store";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import {instance} from "@/instance";
 
 const props = defineProps<{
 	userAcct?: string;
diff --git a/packages/client/src/pages/no-graze.vue b/packages/client/src/pages/no-graze.vue
index b6e01ebce..8b4617cfc 100644
--- a/packages/client/src/pages/no-graze.vue
+++ b/packages/client/src/pages/no-graze.vue
@@ -2,7 +2,7 @@
 	<transition :name="$store.state.animation ? 'zoom' : ''" appear>
 		<div :class="$style.root">
 			<img
-				src="/static-assets/badges/info.png"
+				:src="instance.images.info"
 				class="_ghost"
 				alt="Error"
 			/>
@@ -16,6 +16,7 @@
 
 <script lang="ts" setup>
 import { i18n } from "@/i18n";
+import {instance} from "@/instance";
 </script>
 
 <style lang="scss" module>
diff --git a/packages/client/src/pages/not-found.vue b/packages/client/src/pages/not-found.vue
index d4ec84cff..fa27feb72 100644
--- a/packages/client/src/pages/not-found.vue
+++ b/packages/client/src/pages/not-found.vue
@@ -2,7 +2,7 @@
 	<div class="ipledcug">
 		<div class="_fullinfo">
 			<img
-				src="/static-assets/badges/not-found.png"
+				:src="instance.images.notFound"
 				class="_ghost"
 				alt="Not found"
 			/>
@@ -14,6 +14,7 @@
 <script lang="ts" setup>
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import { instance } from "@/instance";
 
 const headerActions = $computed(() => []);
 
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 8fd7d3b4d..24043fbb1 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -32,7 +32,7 @@
 						<transition :name="$store.state.animation ? 'zoom' : ''" appear>
 							<div class="_fullinfo" ref="notes">
 								<img
-									src="/static-assets/badges/info.png"
+									:src="instance.images.info"
 									class="_ghost"
 									alt="Info"
 								/>
@@ -69,6 +69,7 @@ import { deviceKind } from "@/scripts/device-kind";
 import { $i } from "@/account";
 import "swiper/scss";
 import "swiper/scss/virtual";
+import {instance} from "@/instance";
 
 const props = defineProps<{
 	query: string;
diff --git a/packages/client/src/pages/settings/apps.vue b/packages/client/src/pages/settings/apps.vue
index f42bb77ba..7ff99b922 100644
--- a/packages/client/src/pages/settings/apps.vue
+++ b/packages/client/src/pages/settings/apps.vue
@@ -4,7 +4,7 @@
 			<template #empty>
 				<div class="_fullinfo">
 					<img
-						src="/static-assets/badges/info.png"
+						:src="instance.images.info"
 						class="_ghost"
 						alt="Info"
 					/>
@@ -60,6 +60,7 @@ import FormPagination from "@/components/MkPagination.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import {instance} from "@/instance";
 
 const list = ref<any>(null);
 
diff --git a/packages/iceshrimp-js/src/entities.ts b/packages/iceshrimp-js/src/entities.ts
index 4bd61996e..4a4ae9b56 100644
--- a/packages/iceshrimp-js/src/entities.ts
+++ b/packages/iceshrimp-js/src/entities.ts
@@ -301,6 +301,11 @@ export type LiteInstanceMetadata = {
 	enableDiscordIntegration: boolean;
 	enableServiceWorker: boolean;
 	emojis: CustomEmoji[];
+	images: {
+		error: string;
+		notFound: string;
+		info: string;
+	};
 };
 
 export type DetailedInstanceMetadata = LiteInstanceMetadata & {