diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue index 414889125c..9fcbb3ae6f 100644 --- a/packages/frontend/src/pages/admin/index.vue +++ b/packages/frontend/src/pages/admin/index.vue @@ -261,6 +261,7 @@ provideMetadataReceiver((info) => { childInfo.value = null; } else { childInfo.value = info; + INFO.value.needWideArea = info.value.needWideArea ?? undefined; } }); @@ -268,7 +269,7 @@ function invite() { os.api('admin/invite/create').then(x => { os.alert({ type: 'info', - text: x?.[0].code, + text: x[0].code, }); }).catch(err => { os.alert({ diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue index 49290e7c22..633ee894a9 100644 --- a/packages/frontend/src/pages/settings/index.vue +++ b/packages/frontend/src/pages/settings/index.vue @@ -236,6 +236,7 @@ provideMetadataReceiver((info) => { childInfo.value = null; } else { childInfo.value = info; + INFO.value.needWideArea = info.value?.needWideArea ?? undefined; } }); diff --git a/packages/frontend/src/scripts/page-metadata.ts b/packages/frontend/src/scripts/page-metadata.ts index 330ba8da83..369e46aae1 100644 --- a/packages/frontend/src/scripts/page-metadata.ts +++ b/packages/frontend/src/scripts/page-metadata.ts @@ -15,6 +15,7 @@ export type PageMetadata = { icon?: string | null; avatar?: Misskey.entities.User | null; userName?: Misskey.entities.User | null; + needWideArea?: boolean; }; export function definePageMetadata(metadata: PageMetadata | null | Ref | ComputedRef): void { diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue index 1a9f939c83..b5381396cd 100644 --- a/packages/frontend/src/ui/classic.vue +++ b/packages/frontend/src/ui/classic.vue @@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only -
+
@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
@@ -64,7 +64,7 @@ const DESKTOP_THRESHOLD = 1100; const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD); -const pageMetadata = ref>(); +const pageMetadata = ref(); const widgetsShowing = ref(false); const fullView = ref(false); const globalHeaderHeight = ref(0); @@ -76,9 +76,9 @@ const widgetsRight = ref(); provide('router', mainRouter); provideMetadataReceiver((info) => { - pageMetadata.value = info; - if (pageMetadata.value.value) { - document.title = `${pageMetadata.value.value.title} | ${instanceName}`; + pageMetadata.value = info.value; + if (pageMetadata.value) { + document.title = `${pageMetadata.value.title} | ${instanceName}`; } }); provide('shouldHeaderThin', showMenuOnTop.value); diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue index 4721507f7e..cba7b82610 100644 --- a/packages/frontend/src/ui/universal.vue +++ b/packages/frontend/src/ui/universal.vue @@ -18,11 +18,11 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
- +
@@ -95,7 +95,7 @@ SPDX-License-Identifier: AGPL-3.0-only