diff --git "a/src/api/routes/channels/\043channel_id/webhooks.ts" "b/src/api/routes/channels/\043channel_id/webhooks.ts" index 106d844..9d226b1 100644 --- "a/src/api/routes/channels/\043channel_id/webhooks.ts" +++ "b/src/api/routes/channels/\043channel_id/webhooks.ts" @@ -43,11 +43,10 @@ relations: ["user", "channel", "source_channel", "guild", "source_guild", "application"], }); - const instanceUrl = Config.get().api.endpointPublic || "http://localhost:3001"; return res.json( webhooks.map((webhook) => ({ ...webhook, - url: instanceUrl + "/webhooks/" + webhook.id + "/" + webhook.token, + url: Config.get().api.endpointPublic + "/webhooks/" + webhook.id + "/" + webhook.token, })), ); }, diff --git "a/src/api/routes/webhooks/\043webhook_id/\043token/index.ts" "b/src/api/routes/webhooks/\043webhook_id/\043token/index.ts" index 18902ac..1b589a7 100644 --- "a/src/api/routes/webhooks/\043webhook_id/\043token/index.ts" +++ "b/src/api/routes/webhooks/\043webhook_id/\043token/index.ts" @@ -35,10 +35,9 @@ throw DiscordApiErrors.INVALID_WEBHOOK_TOKEN_PROVIDED; } - const instanceUrl = Config.get().api.endpointPublic || "http://localhost:3001"; return res.json({ ...webhook, - url: instanceUrl + "/webhooks/" + webhook.id + "/" + webhook.token, + url: Config.get().api.endpointPublic + "/webhooks/" + webhook.id + "/" + webhook.token, }); }, ); diff --git "a/src/api/routes/webhooks/\043webhook_id/index.ts" "b/src/api/routes/webhooks/\043webhook_id/index.ts" index 3a0dfe5..9c0a641 100644 --- "a/src/api/routes/webhooks/\043webhook_id/index.ts" +++ "b/src/api/routes/webhooks/\043webhook_id/index.ts" @@ -29,10 +29,9 @@ if (!permission.has("MANAGE_WEBHOOKS")) throw DiscordApiErrors.UNKNOWN_WEBHOOK; } else if (webhook.user_id != req.user_id) throw DiscordApiErrors.UNKNOWN_WEBHOOK; - const instanceUrl = Config.get().api.endpointPublic || "http://localhost:3001"; return res.json({ ...webhook, - url: instanceUrl + "/webhooks/" + webhook.id + "/" + webhook.token, + url: Config.get().api.endpointPublic + "/webhooks/" + webhook.id + "/" + webhook.token, }); }, ); diff --git a/src/util/connections/Connection.ts b/src/util/connections/Connection.ts index bfe2d76..7eb8bdd 100644 --- a/src/util/connections/Connection.ts +++ b/src/util/connections/Connection.ts @@ -42,8 +42,7 @@ * @returns redirect_uri for this connection */ getRedirectUri() { - const endpointPublic = Config.get().general.frontPage ?? "http://localhost:3001"; - return `${endpointPublic}/connections/${this.id}/callback`; + return `${Config.get().general.frontPage}/connections/${this.id}/callback`; } /** diff --git a/src/util/util/cdn.ts b/src/util/util/cdn.ts index 398e747..115fcb4 100644 --- a/src/util/util/cdn.ts +++ b/src/util/util/cdn.ts @@ -34,7 +34,7 @@ filename: file.originalname, }); - const response = await fetch(`${Config.get().cdn.endpointPrivate || "http://localhost:3001"}${path}`, { + const response = await fetch(`${Config.get().cdn.endpointPrivate}${path}`, { headers: { signature: Config.get().security.requestSignature, ...form.getHeaders(), @@ -67,7 +67,7 @@ } export async function deleteFile(path: string) { - const response = await fetch(`${Config.get().cdn.endpointPrivate || "http://localhost:3001"}${path}`, { + const response = await fetch(`${Config.get().cdn.endpointPrivate}${path}`, { headers: { signature: Config.get().security.requestSignature, }, diff --git a/src/util/util/email/index.ts b/src/util/util/email/index.ts index 4773b0d..729d5dd 100644 --- a/src/util/util/email/index.ts +++ b/src/util/util/email/index.ts @@ -130,7 +130,7 @@ generateLink: async function (type, id) { const token = (await generateToken(id)) as string; // puyodead1: this is set to api endpoint because the verification page is on the server since no clients have one, and not all 3rd party clients will have one - const instanceUrl = Config.get().api.endpointPublic?.replace("/api", "") || "http://localhost:3001"; + const instanceUrl = Config.get().api.endpointPublic?.replace("/api", ""); const dashedType = type.replace(/([A-Z])/g, "-$1").toLowerCase(); const link = `${instanceUrl}/${dashedType}#token=${token}`; return link;