From 587ab8500abb2d8b0a494dc05952c9919cc7f66f Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Mon, 2 Mar 2026 16:05:12 -0500 Subject: split url into webUrl and localUrl (like mastodon) --- .../src/queue/processors/ExportCustomEmojisProcessorService.ts | 2 +- .../src/queue/processors/SystemWebhookDeliverProcessorService.ts | 4 ++-- .../src/queue/processors/UserWebhookDeliverProcessorService.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/backend/src/queue') diff --git a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts index 53ecd2d180..5a7bef824f 100644 --- a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts @@ -75,7 +75,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 f6bef52684..0d85812587 100644 --- a/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/SystemWebhookDeliverProcessorService.ts @@ -41,13 +41,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 9ec630ef70..3d764125af 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, -- cgit v1.2.3-freya