split url into webUrl and localUrl (like mastodon)stable

14 files changed, 28 insertions, 25 deletions

diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index c40d042fa4..2df92e4607 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -150,10 +150,10 @@ export class ClientServerService {
 		let manifest = {
 			// 空文字列の場合右辺を使いたいため
 			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			'short_name': this.meta.shortName || this.meta.name || this.config.host,
+			'short_name': this.meta.shortName || this.meta.name || this.config.webHost,
 			// 空文字列の場合右辺を使いたいため
 			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-			'name': this.meta.name || this.config.host,
+			'name': this.meta.name || this.config.webHost,
 			'start_url': '/',
 			'display': 'standalone',
 			'background_color': '#313a42',
@@ -213,7 +213,8 @@ export class ClientServerService {
 			serverErrorImageUrl: meta.serverErrorImageUrl ?? '/client-assets/status/error.png',
 			infoImageUrl: meta.infoImageUrl ?? '/client-assets/status/nothinghere.png',
 			notFoundImageUrl: meta.notFoundImageUrl ?? '/client-assets/status/missingpage.webp',
-			instanceUrl: this.config.url,
+			instanceUrl: this.config.webUrl,
+			localUrl: this.config.localUrl,
 			randomMOTD: this.config.customMOTD ? this.config.customMOTD[Math.floor(Math.random() * this.config.customMOTD.length)] : undefined,
 			metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(meta)),
 			now: Date.now(),
@@ -441,8 +442,8 @@ export class ClientServerService {
 			content += `<ShortName>${name}</ShortName>`;
 			content += `<Description>${name} Search</Description>`;
 			content += '<InputEncoding>UTF-8</InputEncoding>';
-			content += `<Image width="16" height="16" type="image/x-icon">${this.config.url}/favicon.ico</Image>`;
-			content += `<Url type="text/html" template="${this.config.url}/search?q={searchTerms}"/>`;
+			content += `<Image width="16" height="16" type="image/x-icon">${this.config.webUrl}/favicon.ico</Image>`;
+			content += `<Url type="text/html" template="${this.config.webUrl}/search?q={searchTerms}"/>`;
 			content += '</OpenSearchDescription>';
 
 			reply.header('Content-Type', 'application/opensearchdescription+xml');
@@ -455,7 +456,7 @@ export class ClientServerService {
 			reply.header('Cache-Control', 'public, max-age=30');
 			return await reply.view('base', {
 				img: this.meta.bannerUrl,
-				url: this.config.url,
+				url: this.config.webUrl,
 				title: this.meta.name ?? 'Sharkey',
 				desc: this.meta.description,
 				customHead: this.config.customHtml.head,
@@ -889,8 +890,8 @@ export class ClientServerService {
 
 			return await reply.view('info-card', {
 				version: this.config.version,
-				host: this.config.host,
-				url: this.config.url,
+				host: this.config.webHost,
+				url: this.config.webUrl,
 				meta: this.meta,
 				originalUsersCount: await this.usersRepository.countBy({ host: IsNull() }),
 				originalNotesCount: await this.notesRepository.countBy({ userHost: IsNull() }),
diff --git a/packages/backend/src/server/web/FeedService.ts b/packages/backend/src/server/web/FeedService.ts
index a622ae7e34..e005a96732 100644
--- a/packages/backend/src/server/web/FeedService.ts
+++ b/packages/backend/src/server/web/FeedService.ts
@@ -42,7 +42,7 @@ export class FeedService {
 	@bindThis
 	public async packFeed(user: MiUser) {
 		const author = {
-			link: `${this.config.url}/@${user.username}`,
+			link: `${this.config.webUrl}/@${user.username}`,
 			name: user.name ?? user.username,
 		};
 
@@ -60,7 +60,7 @@ export class FeedService {
 
 		const feed = new Feed({
 			id: author.link,
-			title: `${author.name} (@${user.username}@${this.config.host})`,
+			title: `${author.name} (@${user.username}@${this.config.localHost})`,
 			updated: notes.length !== 0 ? this.idService.parse(notes[0].id).date : undefined,
 			generator: 'Sharkey',
 			description: `${user.notesCount} Notes, ${profile.followingVisibility === 'public' ? user.followingCount : '?'} Following, ${profile.followersVisibility === 'public' ? user.followersCount : '?'} Followers${profile.description ? ` · ${profile.description}` : ''}`,
@@ -92,7 +92,7 @@ export class FeedService {
 
 			feed.addItem({
 				title: `New note by ${author.name}`,
-				link: `${this.config.url}/notes/${note.id}`,
+				link: `${this.config.webUrl}/notes/${note.id}`,
 				date: this.idService.parse(note.id).date,
 				description: note.cw ?? undefined,
 				content: text ? this.mfmService.toHtml(mfmParse(text), JSON.parse(note.mentionedRemoteUsers)) ?? undefined : undefined,
diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 71a142fc6f..6168fb3602 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -477,7 +477,7 @@ export class UrlPreviewService {
 		const url = URL.parse(summary.url);
 
 		const acct = Acct.parse(summary.fediverseCreator);
-		if (acct.host?.toLowerCase() === this.config.host) {
+		if (acct.host?.toLowerCase() === this.config.localHost) {
 			acct.host = null;
 		}
 		try {
diff --git a/packages/backend/src/server/web/views/announcement.pug b/packages/backend/src/server/web/views/announcement.pug
index 7a4052e8a4..2b35480c63 100644
--- a/packages/backend/src/server/web/views/announcement.pug
+++ b/packages/backend/src/server/web/views/announcement.pug
@@ -3,7 +3,7 @@ extends ./base
 block vars
 	- const title = announcement.title;
 	- const description = announcement.text.length > 100 ? announcement.text.slice(0, 100) + '…' : announcement.text;
-	- const url = `${config.url}/announcements/${announcement.id}`;
+	- const url = `${config.webUrl}/announcements/${announcement.id}`;
 
 block title
 	= `${title} | ${instanceName}`
diff --git a/packages/backend/src/server/web/views/base-embed.pug b/packages/backend/src/server/web/views/base-embed.pug
index 6ef9281b8f..ef7d02e42a 100644
--- a/packages/backend/src/server/web/views/base-embed.pug
+++ b/packages/backend/src/server/web/views/base-embed.pug
@@ -15,6 +15,7 @@ html(class='embed')
 		meta(name='theme-color-orig' content= themeColor || '#86b300')
 		meta(property='og:site_name' content= instanceName || 'Sharkey')
 		meta(property='instance_url' content= instanceUrl)
+		meta(property='local_url' content= localUrl)
 		meta(name='viewport' content='width=device-width, initial-scale=1')
 		meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no')
 		link(rel='icon' href= icon || '/favicon.ico')
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index d9d750281d..0bd6788a8d 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -2,7 +2,7 @@ block vars
 
 block loadClientEntry
 	- const entry = config.frontendEntry;
-	- const baseUrl = config.url;
+	- const baseUrl = config.webUrl;
 
 doctype html
 
@@ -32,6 +32,7 @@ html
 		meta(name='theme-color-orig' content= themeColor || '#86b300')
 		meta(property='og:site_name' content= instanceName || 'Sharkey')
 		meta(property='instance_url' content= instanceUrl)
+		meta(property='local_url' content= localUrl)
 		meta(name='viewport' content='width=device-width, initial-scale=1')
 		meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no')
 		link(rel='icon' href= icon || '/favicon.ico')
diff --git a/packages/backend/src/server/web/views/channel.pug b/packages/backend/src/server/web/views/channel.pug
index c514025e0b..530d56b51f 100644
--- a/packages/backend/src/server/web/views/channel.pug
+++ b/packages/backend/src/server/web/views/channel.pug
@@ -2,7 +2,7 @@ extends ./base
 
 block vars
 	- const title = channel.name;
-	- const url = `${config.url}/channels/${channel.id}`;
+	- const url = `${config.webUrl}/channels/${channel.id}`;
 
 block title
 	= `${title} | ${instanceName}`
diff --git a/packages/backend/src/server/web/views/clip.pug b/packages/backend/src/server/web/views/clip.pug
index 5a0018803a..b6f2b02599 100644
--- a/packages/backend/src/server/web/views/clip.pug
+++ b/packages/backend/src/server/web/views/clip.pug
@@ -3,7 +3,7 @@ extends ./base
 block vars
 	- const user = clip.user;
 	- const title = clip.name;
-	- const url = `${config.url}/clips/${clip.id}`;
+	- const url = `${config.webUrl}/clips/${clip.id}`;
 
 block title
 	= `${title} | ${instanceName}`
diff --git a/packages/backend/src/server/web/views/flash.pug b/packages/backend/src/server/web/views/flash.pug
index 1549aa7906..22961c6dcd 100644
--- a/packages/backend/src/server/web/views/flash.pug
+++ b/packages/backend/src/server/web/views/flash.pug
@@ -3,7 +3,7 @@ extends ./base
 block vars
 	- const user = flash.user;
 	- const title = flash.title;
-	- const url = `${config.url}/play/${flash.id}`;
+	- const url = `${config.webUrl}/play/${flash.id}`;
 
 block title
 	= `${title} | ${instanceName}`
diff --git a/packages/backend/src/server/web/views/gallery-post.pug b/packages/backend/src/server/web/views/gallery-post.pug
index 9ae25d9ac8..4ed44d0a4b 100644
--- a/packages/backend/src/server/web/views/gallery-post.pug
+++ b/packages/backend/src/server/web/views/gallery-post.pug
@@ -3,7 +3,7 @@ extends ./base
 block vars
 	- const user = post.user;
 	- const title = post.title;
-	- const url = `${config.url}/gallery/${post.id}`;
+	- const url = `${config.webUrl}/gallery/${post.id}`;
 
 block title
 	= `${title} | ${instanceName}`
diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index 53cff6bcd3..9b755f60a2 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -3,7 +3,7 @@ extends ./base
 block vars
 	- const user = note.user;
 	- const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`;
-	- const url = `${config.url}/notes/${note.id}`;
+	- const url = `${config.webUrl}/notes/${note.id}`;
 	- const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null;
 	- const images = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive)
 	- const videos = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive)
@@ -52,9 +52,9 @@ block meta
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
 
 	if note.prev
-		link(rel='prev' href=`${config.url}/notes/${note.prev}`)
+		link(rel='prev' href=`${config.webUrl}/notes/${note.prev}`)
 	if note.next
-		link(rel='next' href=`${config.url}/notes/${note.next}`)
+		link(rel='next' href=`${config.webUrl}/notes/${note.next}`)
 
 	if !user.host
 		link(rel='alternate' href=url type='application/activity+json')
diff --git a/packages/backend/src/server/web/views/page.pug b/packages/backend/src/server/web/views/page.pug
index 03c50eca8a..fcd54fd05c 100644
--- a/packages/backend/src/server/web/views/page.pug
+++ b/packages/backend/src/server/web/views/page.pug
@@ -3,7 +3,7 @@ extends ./base
 block vars
 	- const user = page.user;
 	- const title = page.title;
-	- const url = `${config.url}/@${user.username}/pages/${page.name}`;
+	- const url = `${config.webUrl}/@${user.username}/pages/${page.name}`;
 
 block title
 	= `${title} | ${instanceName}`
diff --git a/packages/backend/src/server/web/views/reversi-game.pug b/packages/backend/src/server/web/views/reversi-game.pug
index 0b5ffb2bb0..6e0cd32e7f 100644
--- a/packages/backend/src/server/web/views/reversi-game.pug
+++ b/packages/backend/src/server/web/views/reversi-game.pug
@@ -4,7 +4,7 @@ block vars
 	- const user1 = game.user1;
 	- const user2 = game.user2;
 	- const title = `${user1.username} vs ${user2.username}`;
-	- const url = `${config.url}/reversi/g/${game.id}`;
+	- const url = `${config.webUrl}/reversi/g/${game.id}`;
 
 block title
 	= `${title} | ${instanceName}`
diff --git a/packages/backend/src/server/web/views/user.pug b/packages/backend/src/server/web/views/user.pug
index 2b0a7bab5c..7a023e255e 100644
--- a/packages/backend/src/server/web/views/user.pug
+++ b/packages/backend/src/server/web/views/user.pug
@@ -2,7 +2,7 @@ extends ./base
 
 block vars
 	- const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`;
-	- const url = `${config.url}/@${(user.host ? `${user.username}@${user.host}` : user.username)}`;
+	- const url = `${config.webUrl}/@${(user.host ? `${user.username}@${user.host}` : user.username)}`;
 
 block title
 	= `${title} | ${instanceName}`
@@ -33,7 +33,7 @@ block meta
 
 	if !sub
 		if !user.host
-			link(rel='alternate' href=`${config.url}/users/${user.id}` type='application/activity+json')
+			link(rel='alternate' href=`${config.webUrl}/users/${user.id}` type='application/activity+json')
 		if user.uri
 			link(rel='alternate' href=user.uri type='application/activity+json')
 		if profile.url