split url into webUrl and localUrl (like mastodon)stable

4 files changed, 16 insertions, 16 deletions

diff --git a/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts b/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
index 58d542635f..1410874f02 100644
--- a/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
+++ b/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
@@ -125,7 +125,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeUser(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","user":[`);
+		await writeUser(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","user":[`);
 
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		const { host, uri, sharedInbox, followersUri, lastFetchedAt, inbox, ...userTrimmed } = user;
@@ -160,7 +160,7 @@ export class ExportAccountDataProcessorService {
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		const { emailVerifyCode, twoFactorBackupSecret, twoFactorSecret, password, twoFactorTempSecret, userHost, ...profileTrimmed } = profile;
 
-		await writeProfile(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","profile":[`);
+		await writeProfile(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","profile":[`);
 
 		await writeProfile(JSON.stringify(profileTrimmed));
 
@@ -191,7 +191,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeIPs(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","ips":[`);
+		await writeIPs(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","ips":[`);
 
 		for (const signin of signins) {
 			// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -226,7 +226,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeNotes(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","notes":[`);
+		await writeNotes(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","notes":[`);
 
 		let noteCursor: MiNote['id'] | null = null;
 		let exportedNotesCount = 0;
@@ -287,7 +287,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeFollowing(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","followings":[`);
+		await writeFollowing(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","followings":[`);
 
 		let followingsCursor: MiFollowing['id'] | null = null;
 		let exportedFollowingsCount = 0;
@@ -357,7 +357,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeFollowers(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","followers":[`);
+		await writeFollowers(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","followers":[`);
 
 		let followersCursor: MiFollowing['id'] | null = null;
 		let exportedFollowersCount = 0;
@@ -420,7 +420,7 @@ export class ExportAccountDataProcessorService {
 
 		fs.mkdirSync(`${path}/files`);
 
-		await writeDrive(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","drive":[`);
+		await writeDrive(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","drive":[`);
 
 		const driveFiles = await this.driveFilesRepository.find({ where: { userId: user.id } });
 
@@ -476,7 +476,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeMuting(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","mutings":[`);
+		await writeMuting(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","mutings":[`);
 
 		let exportedMutingCount = 0;
 		let mutingCursor: MiMuting['id'] | null = null;
@@ -539,7 +539,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeBlocking(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","blockings":[`);
+		await writeBlocking(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","blockings":[`);
 
 		let exportedBlockingCount = 0;
 		let blockingCursor: MiBlocking['id'] | null = null;
@@ -601,7 +601,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeFavorite(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","favorites":[`);
+		await writeFavorite(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","favorites":[`);
 
 		let exportedFavoritesCount = 0;
 		let favoriteCursor: MiNoteFavorite['id'] | null = null;
@@ -662,7 +662,7 @@ export class ExportAccountDataProcessorService {
 			});
 		};
 
-		await writeAntenna(`{"metaVersion":1,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","antennas":[`);
+		await writeAntenna(`{"metaVersion":1,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","antennas":[`);
 
 		const antennas = await this.antennasRepository.findBy({ userId: user.id });
 
diff --git a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts
index b8f208bbfc..d3edc7890b 100644
--- a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts
+++ b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts
@@ -76,7 +76,7 @@ export class ExportCustomEmojisProcessorService {
 			});
 		};
 
-		await writeMeta(`{"metaVersion":2,"host":"${this.config.host}","exportedAt":"${new Date().toString()}","emojis":[`);
+		await writeMeta(`{"metaVersion":2,"host":"${this.config.webHost}","exportedAt":"${new Date().toString()}","emojis":[`);
 
 		const customEmojis = await this.emojisRepository.find({
 			where: {
diff --git a/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts
index f9fcd1e928..a3c0c47162 100644
--- a/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts
@@ -42,13 +42,13 @@ export class SystemWebhookDeliverProcessorService {
 				method: 'POST',
 				headers: {
 					'User-Agent': 'Misskey-Hooks',
-					'X-Misskey-Host': this.config.host,
+					'X-Misskey-Host': this.config.webHost,
 					'X-Misskey-Hook-Id': job.data.webhookId,
 					'X-Misskey-Hook-Secret': job.data.secret,
 					'Content-Type': 'application/json',
 				},
 				body: JSON.stringify({
-					server: this.config.url,
+					server: this.config.webUrl,
 					hookId: job.data.webhookId,
 					eventId: job.data.eventId,
 					createdAt: job.data.createdAt,
diff --git a/packages/backend/src/queue/processors/UserWebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/UserWebhookDeliverProcessorService.ts
index 0208ce6038..411f6023a8 100644
--- a/packages/backend/src/queue/processors/UserWebhookDeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/UserWebhookDeliverProcessorService.ts
@@ -41,13 +41,13 @@ export class UserWebhookDeliverProcessorService {
 				method: 'POST',
 				headers: {
 					'User-Agent': 'Misskey-Hooks',
-					'X-Misskey-Host': this.config.host,
+					'X-Misskey-Host': this.config.webHost,
 					'X-Misskey-Hook-Id': job.data.webhookId,
 					'X-Misskey-Hook-Secret': job.data.secret,
 					'Content-Type': 'application/json',
 				},
 				body: JSON.stringify({
-					server: this.config.url,
+					server: this.config.webUrl,
 					hookId: job.data.webhookId,
 					userId: job.data.userId,
 					eventId: job.data.eventId,