split url into webUrl and localUrl (like mastodon)stable

4 files changed, 7 insertions, 7 deletions

diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts
index c485555f90..06b20928a1 100644
--- a/packages/backend/src/core/entities/DriveFileEntityService.ts
+++ b/packages/backend/src/core/entities/DriveFileEntityService.ts
@@ -119,7 +119,7 @@ export class DriveFileEntityService {
 			const key = file.webpublicAccessKey;
 
 			if (key && !key.match('/')) {	// 古いものはここにオブジェクトストレージキーが入ってるので除外
-				const url = `${this.config.url}/files/${key}`;
+				const url = `${this.config.webUrl}/files/${key}`;
 				if (mode === 'avatar') return this.getProxiedUrl(file.uri, 'avatar');
 				return url;
 			}
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 294187feba..79e9c90528 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -73,7 +73,7 @@ export class MetaEntityService {
 
 			name: instance.name,
 			shortName: instance.shortName,
-			uri: this.config.url,
+			uri: this.config.webUrl,
 			description: instance.description,
 			langs: instance.langs,
 			tosUrl: instance.termsOfServiceUrl,
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 4248fde77f..03f7ced909 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -833,6 +833,6 @@ export class NoteEntityService implements OnModuleInit {
 
 	@bindThis
 	public genLocalNoteUri(noteId: string): string {
-		return `${this.config.url}/notes/${noteId}`;
+		return `${this.config.webUrl}/notes/${noteId}`;
 	}
 }
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 638eaac16f..c88632b856 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -400,10 +400,10 @@ export class UserEntityService implements OnModuleInit {
 
 	@bindThis
 	public getIdenticonUrl(user: MiUser): string {
-		if ((user.host == null || user.host === this.config.host) && user.username.includes('.') && this.meta.iconUrl) { // ローカルのシステムアカウントの場合
+		if ((user.host == null || user.host === this.config.localHost) && user.username.includes('.') && this.meta.iconUrl) { // ローカルのシステムアカウントの場合
 			return this.meta.iconUrl;
 		} else {
-			return `${this.config.url}/identicon/${user.username.toLowerCase()}@${user.host ?? this.config.host}`;
+			return `${this.config.webUrl}/identicon/${user.username.toLowerCase()}@${user.host ?? this.config.localHost}`;
 		}
 	}
 
@@ -415,7 +415,7 @@ export class UserEntityService implements OnModuleInit {
 
 	@bindThis
 	public genLocalUserUri(userId: string): string {
-		return `${this.config.url}/users/${userId}`;
+		return `${this.config.webUrl}/users/${userId}`;
 	}
 
 	public async pack<S extends 'MeDetailed' | 'UserDetailedNotMe' | 'UserDetailed' | 'UserLite' = 'UserLite'>(
@@ -531,7 +531,7 @@ export class UserEntityService implements OnModuleInit {
 				...announcement,
 			})) : null;
 
-		const checkHost = user.host == null ? this.config.host : user.host;
+		const checkHost = user.host == null ? this.config.localHost : user.host;
 		const notificationsInfo = isMe && isDetailed ? await this.getNotificationsInfo(user.id) : null;
 
 		let fetchPoliciesPromise: Promise<RolePolicies> | null = null;