packages/frontend/assets/kawaii/LICENSE_SAWARATSUKI_KawaiiLogos

@@ -1,18 +0,0 @@
-LICENSE
--------
-
-Copyright (c) by [さわらつき](https://github.com/SAWARATSUKI)
-
-The following files:
-
-- misskey-io.png
-- about-icon.png
-
-are licensed under proprietary license. To view a copy of this license, visit https://github.com/SAWARATSUKI/KawaiiLogos/blob/main/README_EN.md#license
-AND SHOULD NOT be considered as part of this project, which is licensed under AGPL-3.0-only.
-
-The following files:
-
-- about-icon.png (uwl.png)
-
-were copied from [misskey-dev/misskey-hub-next](https://github.com/misskey-dev/misskey-hub-next/tree/221a89760e80d75a00600c4e37e22c0f226a6017/public/img/uwu)

packages/frontend/src/boot/common.ts

@@ -5,6 +5,7 @@
 
 import { computed, watch, version as vueVersion, App } from 'vue';
 import { compareVersions } from 'compare-versions';
+import VueGtag, { bootstrap as gtagBootstrap, GtagConsent, GtagConsentParams } from 'vue-gtag';
 import widgets from '@/widgets/index.js';
 import directives from '@/directives/index.js';
 import components from '@/components/index.js';
@@ -24,7 +25,6 @@ import { miLocalStorage } from '@/local-storage.js';
 import { fetchCustomEmojis } from '@/custom-emojis.js';
 import { setupRouter } from '@/router/definition.js';
 import { mainRouter } from '@/router/main.js';
-import VueGtag, { bootstrap as gtagBootstrap, GtagConsent, GtagConsentParams } from 'vue-gtag';
 
 export async function common(createVue: () => App<Element>) {
 	console.info(`Misskey v${version}`);
@@ -144,17 +144,6 @@ export async function common(createVue: () => App<Element>) {
 	}
 	//#endregion
 
-	//#region kawaii
-	if (params.has('kawaii') || params.has('uwu')) {
-		const v = params.get('kawaii') ?? params.get('uwu');
-		if (v === 'false' || v === '0' || v === 'no' || v === 'off') {
-			miLocalStorage.removeItem('kawaii');
-		} else {
-			miLocalStorage.setItem('kawaii', 'true');
-		}
-	}
-	//#endregion
-
 	// NOTE: この処理は必ずクライアント更新チェック処理より後に来ること(テーマ再構築のため)
 	watch(defaultStore.reactiveState.darkMode, (darkMode) => {
 		applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));

packages/frontend/src/components/MkVisitorDashboard.vue

@@ -6,8 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div v-if="instance" :class="$style.root">
 	<div :class="[$style.main, $style.panel]">
-		<img v-if="kawaiiMode" src="/client-assets/kawaii/misskey-io.png" alt="Logo by @sawaratsuki@misskey.io" :class="$style.mainIconAlt"/>
+		<img :src="instance.iconUrl || '/favicon.ico'" alt="" :class="$style.mainIcon"/>
-		<img v-else :src="instance.iconUrl || '/favicon.ico'" alt="" :class="$style.mainIcon"/>
 		<button class="_button _acrylic" :class="$style.mainMenu" @click="showMenu"><i class="ti ti-dots"></i></button>
 		<div :class="$style.mainFg">
 			<h1 :class="$style.mainTitle">
@@ -82,12 +81,10 @@ import * as os from '@/os.js';
 import { misskeyApiGet } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
-import { miLocalStorage } from '@/local-storage.js';
 import MkNumber from '@/components/MkNumber.vue';
 import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue';
 import { openInstanceMenu } from '@/ui/_common_/common';
 
-const kawaiiMode = miLocalStorage.getItem('kawaii') === 'true';
 const stats = ref<Misskey.entities.StatsResponse | null>(null);
 
 misskeyApiGet('stats').then((res) => {

packages/frontend/src/local-storage.ts

@@ -40,7 +40,6 @@ type Keys =
 	'lastEmojisFetchedAt' | // DEPRECATED, stored in indexeddb (13.9.0~)
 	'emojis' | // DEPRECATED, stored in indexeddb (13.9.0~);
 	`channelLastReadedAt:${string}` |
-	'kawaii' |
 	'gaConsent' |
 	'gtagConsent'
 	;

packages/frontend/src/navbar.ts

@@ -15,8 +15,6 @@ import { ui, host } from '@/config.js';
 import { unisonReload } from '@/scripts/unison-reload.js';
 import { instance } from '@/instance.js';
 
-const kawaiiMode = miLocalStorage.getItem('kawaii') === 'true';
-
 export const navbarItemDef = reactive({
 	notifications: {
 		title: i18n.ts.notifications,
@@ -180,15 +178,6 @@ export const navbarItemDef = reactive({
 		show: computed(() => $i != null),
 		to: `/@${$i?.username}`,
 	},
-	kawaii: {
-		title: kawaiiMode ? 'no uwu plz' : 'uwu?',
-		icon: kawaiiMode ? 'ti ti-mood-smile' : 'ti ti-mood-wink',
-		action: (ev) => {
-			if (kawaiiMode) miLocalStorage.removeItem('kawaii');
-			else miLocalStorage.setItem('kawaii', 'true');
-			location.reload();
-		},
-	},
 	support: {
 		title: i18n.tsx.supportThisInstance({ name: instance.name ?? host }),
 		icon: 'ti ti-pig-money',

packages/frontend/src/pages/about-misskey.vue

@@ -11,9 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div class="_gaps_m znqjceqz">
 				<div v-panel class="about">
 					<div ref="containerEl" class="container" :class="{ playing: easterEggEngine != null }">
-						<img v-if="kawaiiMode" src="/client-assets/kawaii/about-icon.png" alt="" class="iconAlt" draggable="false" @load="iconLoaded" @click="gravity"/>
+						<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
-						<img v-else src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
-						<Mfm v-if="kawaiiMode" text="Logo by @sawaratsuki@misskey.io" class="iconCredit"/>
 						<div class="misskey">Misskey</div>
 						<div class="version">v{{ version }}</div>
 						<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }">
@@ -139,14 +137,11 @@ import { physics } from '@/scripts/physics.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
 import { defaultStore } from '@/store.js';
-import { miLocalStorage } from '@/local-storage.js';
 import * as os from '@/os.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { claimAchievement, claimedAchievements } from '@/scripts/achievements.js';
 import { $i } from '@/account.js';
 
-const kawaiiMode = miLocalStorage.getItem('kawaii') === 'true';
-
 const patronsWithIcon = [{
 	name: 'カイヤン',
 	icon: 'https://assets.misskey-hub.net/patrons/a2820716883e408cb87773e377ce7c8d.jpg',

packages/frontend/src/pages/about.vue

@@ -11,9 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div class="_gaps_m">
 				<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }">
 					<div style="overflow: clip;">
-						<img v-if="kawaiiMode" src="/client-assets/kawaii/misskey-io.png" alt="" :class="$style.bannerIconAlt"/>
+						<img :src="instance.iconUrl ?? instance.faviconUrl ?? '/favicon.ico'" alt="" :class="$style.bannerIcon"/>
-						<img v-else :src="instance.iconUrl ?? instance.faviconUrl ?? '/favicon.ico'" alt="" :class="$style.bannerIcon"/>
-						<Mfm v-if="kawaiiMode" text="Logo by @sawaratsuki@misskey.io" :class="$style.iconCredit"/>
 						<div :class="$style.bannerName">
 							<b>{{ instance.name ?? host }}</b>
 						</div>
@@ -170,7 +168,6 @@ import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { claimAchievement } from '@/scripts/achievements.js';
 import { instance } from '@/instance.js';
-import { miLocalStorage } from '@/local-storage.js';
 
 const props = withDefaults(defineProps<{
 	initialTab?: string;
@@ -178,7 +175,6 @@ const props = withDefaults(defineProps<{
 	initialTab: 'overview',
 });
 
-const kawaiiMode = miLocalStorage.getItem('kawaii') === 'true';
 const stats = ref<Misskey.entities.StatsResponse | null>(null);
 const tab = ref(props.initialTab);
 

packages/frontend/src/ui/_common_/navbar.vue

@@ -9,8 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div :class="$style.top">
 			<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }"></div>
 			<button v-tooltip.noDelay.right="instance.name ?? i18n.ts.instance" class="_button" :class="$style.instance" @click="openInstanceMenu">
-				<img v-if="kawaiiMode" src="/client-assets/kawaii/misskey-io.png" alt="" :class="$style.instanceIconAlt"/>
+				<img :src="instance.iconUrl || instance.faviconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
-				<img v-else :src="instance.iconUrl || instance.faviconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
 			</button>
 		</div>
 		<div :class="$style.middle">
@@ -69,10 +68,8 @@ import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
-import { miLocalStorage } from '@/local-storage.js';
 
 const iconOnly = ref(false);
-const kawaiiMode = miLocalStorage.getItem('kawaii') === 'true';
 
 const menu = computed(() => defaultStore.state.menu);
 const otherMenuItemIndicated = computed(() => {
@@ -176,11 +173,6 @@ function more(ev: MouseEvent) {
 		aspect-ratio: 1;
 	}
 
-	.instanceIconAlt {
-		display: inline-block;
-		width: 85%;
-	}
-
 	.bottom {
 		position: sticky;
 		bottom: 0;
@@ -367,11 +359,6 @@ function more(ev: MouseEvent) {
 		aspect-ratio: 1;
 	}
 
-	.instanceIconAlt {
-		display: inline-block;
-		width: 85%;
-	}
-
 	.bottom {
 		position: sticky;
 		bottom: 0;