Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: show real instance url #12273

Merged
merged 36 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
7c9330a
Release: 13.7.3
tamaina Feb 23, 2023
40de144
Release: 13.7.4
tamaina Feb 23, 2023
1ba49b6
Merge pull request #10058 from misskey-dev/develop
syuilo Feb 24, 2023
02c8fd9
Merge pull request #10108 from misskey-dev/develop
syuilo Feb 26, 2023
647ce17
Merge pull request #10112 from misskey-dev/develop
syuilo Feb 26, 2023
5bd68aa
Merge pull request #10177 from misskey-dev/develop
syuilo Mar 3, 2023
b23a9b1
Merge pull request #10181 from misskey-dev/develop
syuilo Mar 3, 2023
ae517a9
Merge pull request #10218 from misskey-dev/develop
syuilo Mar 6, 2023
1e67e9c
Merge pull request #10342 from misskey-dev/develop
syuilo Mar 22, 2023
59768bd
Merge pull request #10383 from misskey-dev/develop
syuilo Mar 22, 2023
a52bbc7
Merge pull request #10388 from misskey-dev/develop
syuilo Mar 22, 2023
f54a954
Merge pull request #10402 from misskey-dev/develop
syuilo Mar 24, 2023
a096f62
Merge pull request #10506 from misskey-dev/develop
syuilo Apr 8, 2023
8b1362a
Merge pull request #10543 from misskey-dev/develop
syuilo Apr 9, 2023
75b28d6
Merge pull request #10578 from misskey-dev/develop
syuilo Apr 11, 2023
d429f81
Update CHANGELOG.md
EbiseLutica Apr 12, 2023
272e0c8
Merge pull request #10606 from misskey-dev/EbiseLutica-patch-1
syuilo Apr 12, 2023
c5d2dba
Merge pull request #10608 from misskey-dev/develop
syuilo Apr 13, 2023
94690c8
Merge pull request #10774 from misskey-dev/develop
syuilo May 9, 2023
9ad5732
Merge pull request #10814 from misskey-dev/develop
syuilo May 9, 2023
de6348e
Merge pull request #10833 from misskey-dev/develop
syuilo May 12, 2023
407a965
Merge pull request #10932 from misskey-dev/develop
syuilo Jun 5, 2023
32c7411
Merge pull request #10961 from misskey-dev/develop
syuilo Jun 6, 2023
7093662
Merge pull request #10990 from misskey-dev/develop
syuilo Jun 13, 2023
e64a81a
Merge pull request #11301 from misskey-dev/develop
syuilo Jul 21, 2023
4e24aff
Merge pull request #11338 from misskey-dev/develop
syuilo Jul 21, 2023
a8d45d4
Merge pull request #11384 from misskey-dev/develop
syuilo Jul 27, 2023
f32915b
Merge pull request #11874 from misskey-dev/develop
syuilo Sep 24, 2023
e57b536
Merge pull request #11898 from misskey-dev/develop
syuilo Sep 25, 2023
7adc8fc
Merge pull request #11920 from misskey-dev/develop
syuilo Sep 29, 2023
0e6cd57
Merge pull request #11926 from misskey-dev/develop
syuilo Sep 30, 2023
f964ef1
Merge pull request #11963 from misskey-dev/develop
syuilo Oct 10, 2023
7e7138c
Merge pull request #12011 from misskey-dev/develop
syuilo Oct 12, 2023
3043b52
Merge pull request #12060 from misskey-dev/develop
syuilo Oct 21, 2023
0c2dd33
Merge pull request #12177 from misskey-dev/develop
syuilo Nov 5, 2023
c304a05
fix: show real instance url
Candinya Nov 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/backend/src/server/web/ClientServerService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
}

Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/server/web/views/base.pug
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading