Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🎨 cdn now also works without setting a public endpoint

Browse Source
This commit is contained in:
Flam3rboy 2021-10-09 14:46:59 +02:00
parent 0516357477
commit d5cdc9198c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/routes/channels/#channel_id/messages/index.ts
View File

@ -103,6 +103,7 @@ router.get("/", async (req: Request, res: Response) => {
} }
const messages = await Message.find(query); const messages = await Message.find(query);
const endpoint = Config.get().cdn.endpointPublic;
return res.json( return res.json(
messages.map((x) => { messages.map((x) => {
@ -115,7 +116,9 @@ router.get("/", async (req: Request, res: Response) => {
// @ts-ignore // @ts-ignore
if (!x.author) x.author = { discriminator: "0000", username: "Deleted User", public_flags: "0", avatar: null }; if (!x.author) x.author = { discriminator: "0000", username: "Deleted User", public_flags: "0", avatar: null };
x.attachments?.forEach((x) => { x.attachments?.forEach((x) => {
x.proxy_url = `${Config.get().cdn.endpointPublic || "http://localhost:3003"}${new URL(x.proxy_url).pathname}`; // dynamically set attachment proxy_url in case the endpoint changed
const uri = x.proxy_url.startsWith("http") ? x.proxy_url : `https://example.org${x.proxy_url}`;
x.proxy_url = `${endpoint == null ? "http://localhost:3003" : endpoint}${new URL(uri).pathname}`;
}); });
return x; return x;

3
bundle/src/Server.ts
View File

@ -30,9 +30,6 @@ async function main() {
cdn: { cdn: {
endpointClient: "${location.host}", endpointClient: "${location.host}",
endpointPrivate: `http://localhost:${port}`, endpointPrivate: `http://localhost:${port}`,
...(!Config.get().cdn.endpointPublic && {
endpointPublic: `http://localhost:${port}`,
}),
}, },
gateway: { gateway: {
endpointClient: endpointClient: