fix: show real instance url (misskey-dev#12273)

* Update CHANGELOG.md * fix: show real instance url --------- Co-authored-by: tamaina <[email protected]> Co-authored-by: syuilo <[email protected]> Co-authored-by: atsuchan <[email protected]> Co-authored-by: Masaya Suzuki <[email protected]> Co-authored-by: Kagami Sascha Rosylight <[email protected]> Co-authored-by: taiy <[email protected]> Co-authored-by: xianon <[email protected]> Co-authored-by: kabo2468 <[email protected]> Co-authored-by: YS <[email protected]> Co-authored-by: Khsmty <[email protected]> Co-authored-by: Soni L <[email protected]> Co-authored-by: mei23 <[email protected]> Co-authored-by: daima3629 <[email protected]> Co-authored-by: Windymelt <[email protected]> Co-authored-by: Ebise Lutica <[email protected]> Co-authored-by: nenohi <[email protected]> Co-authored-by: Acid Chicken (硫酸鶏) <[email protected]> Co-authored-by: rinsuki <[email protected]> Co-authored-by: FineArchs <[email protected]>
atsu1125 · Nov 9, 2023 · e2cac3d · e2cac3d
1 parent 879f2d2
commit e2cac3d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
@@ -175,6 +175,7 @@ export class ClientServerService {
 			serverErrorImageUrl: meta.serverErrorImageUrl ?? 'https://xn--931a.moe/assets/error.jpg',
 			infoImageUrl: meta.infoImageUrl ?? 'https://xn--931a.moe/assets/info.jpg',
 			notFoundImageUrl: meta.notFoundImageUrl ?? 'https://xn--931a.moe/assets/not-found.jpg',
+			instanceUrl: this.config.url,
 		};
 	}
 

diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
@@ -26,6 +26,7 @@ html
 		meta(name='theme-color' content= themeColor || '#86b300')
 		meta(name='theme-color-orig' content= themeColor || '#86b300')
 		meta(property='og:site_name' content= instanceName || 'Misskey')
+		meta(property='instance_url' content= instanceUrl)
 		meta(name='viewport' content='width=device-width, initial-scale=1')
 		link(rel='icon' href= icon || '/favicon.ico')
 		link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')

diff --git a/packages/frontend/src/config.ts b/packages/frontend/src/config.ts
@@ -5,7 +5,7 @@
 
 import { miLocalStorage } from '@/local-storage.js';
 
-const address = new URL(location.href);
+const address = new URL(document.querySelector<HTMLMetaElement>('meta[property="instance_url"]')?.content || location.href);
 const siteName = document.querySelector<HTMLMetaElement>('meta[property="og:site_name"]')?.content;
 
 export const host = address.host;