chore: originをclassicに追従させた

AkariNext · Mar 2, 2024 · 0a0bad1 · 0a0bad1 · github-actions · Mar 2, 2024
1 parent 17693a5
commit 0a0bad1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/packages/frontend/src/ui/origin.vue b/packages/frontend/src/ui/origin.vue
@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-FileCopyrightText: syuilo and misskey-project
 SPDX-License-Identifier: AGPL-3.0-only
 -->
 
@@ -52,19 +52,21 @@ SPDX-License-Identifier: AGPL-3.0-only
 	import { instanceName } from '@/config.js';
 	import { StickySidebar } from '@/scripts/sticky-sidebar.js';
 	import * as os from '@/os.js';
-	import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata.js';
+	import { PageMetadata, provideMetadataReceiver, provideReactiveMetadata } from '@/scripts/page-metadata.js';
 	import { defaultStore } from '@/store.js';
 	import { i18n } from '@/i18n.js';
 	import { miLocalStorage } from '@/local-storage.js';
 	import { mainRouter } from '@/router/main.js';
 	const XHeaderMenu = defineAsyncComponent(() => import('./origin/header.vue'));
 	const XWidgets = defineAsyncComponent(() => import('./universal.widgets.vue'));
 	
+	const isRoot = computed(() => mainRouter.currentRoute.value.name === 'index');
+	
 	const DESKTOP_THRESHOLD = 1100;
 	
 	const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
 	
-	const pageMetadata = ref<null | PageMetadata>();
+	const pageMetadata = ref<null | PageMetadata>(null);
 	const widgetsShowing = ref(false);
 	const fullView = ref(false);
 	const globalHeaderHeight = ref(0);
@@ -75,12 +77,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 	const widgetsRight = ref<HTMLElement>();
 	
 	provide('router', mainRouter);
-	provideMetadataReceiver((info) => {
-		pageMetadata.value = info.value;
+	provideMetadataReceiver((metadataGetter) => {
+		const info = metadataGetter();
+		pageMetadata.value = info;
 		if (pageMetadata.value) {
-			document.title = `${pageMetadata.value.title} | ${instanceName}`;
+			if (isRoot.value && pageMetadata.value.title === instanceName) {
+				document.title = pageMetadata.value.title;
+			} else {
+				document.title = `${pageMetadata.value.title} | ${instanceName}`;
+			}
 		}
 	});
+	provideReactiveMetadata(pageMetadata);
 	provide('shouldHeaderThin', showMenuOnTop.value);
 	provide('forceSpacerMin', true);
 	

diff --git a/packages/frontend/src/ui/origin/header.vue b/packages/frontend/src/ui/origin/header.vue
@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-FileCopyrightText: syuilo and misskey-project
 SPDX-License-Identifier: AGPL-3.0-only
 -->
 

diff --git a/packages/frontend/src/ui/origin/sidebar.vue b/packages/frontend/src/ui/origin/sidebar.vue
@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: syuilo and other misskey contributors
+SPDX-FileCopyrightText: syuilo and misskey-project
 SPDX-License-Identifier: AGPL-3.0-only
 -->