dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-04-25 07:32:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

No more fallback URLs

Browse Source
This commit is contained in:
Rory&
2025-12-17 10:18:17 +01:00
parent 0dd12d0380
commit e008c9947e
6 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/routes/channels/#channel_id/webhooks.ts
View File

@@ -43,11 +43,10 @@ router.get(
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,
})),
);
},

3
src/api/routes/webhooks/#webhook_id/#token/index.ts
View File

@@ -35,10 +35,9 @@ router.get(
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,
});
},
);

3
src/api/routes/webhooks/#webhook_id/index.ts
View File

@@ -29,10 +29,9 @@ router.get(
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,
});
},
);

3
src/util/connections/Connection.ts
View File

@@ -42,8 +42,7 @@ export abstract class Connection {
* @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`;
}
/**

4
src/util/util/cdn.ts
View File

@@ -34,7 +34,7 @@ export async function uploadFile(
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 handleFile(path: string, body?: string): Promise<string |
}
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,
},

2
src/util/util/email/index.ts
View File

@@ -130,7 +130,7 @@ export const Email: {
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;