diff options
| author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2023-01-26 14:30:34 +1100 |
|---|---|---|
| committer | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2023-01-26 14:30:34 +1100 |
| commit | e98cdfbce0a2cda9b18a98b4ccfbf83d4c77ed56 (patch) | |
| tree | 2b1efab39f62cf61200ff59d88bf45079cda50e1 /src | |
| parent | Fix SIGTERM handler not disconnecting gateway clients and leaving timeouts ac... (diff) | |
| parent | also don't use 3002 as default when gateway endpoints are null (diff) | |
| download | server-e98cdfbce0a2cda9b18a98b4ccfbf83d4c77ed56.tar.xz | |
Merge branch 'master' of github.com:fosscord/fosscord-server
Diffstat (limited to 'src')
| -rw-r--r-- | src/api/routes/gateway/bot.ts | 2 | ||||
| -rw-r--r-- | src/api/routes/gateway/index.ts | 2 | ||||
| -rw-r--r-- | src/api/routes/policies/instance/domains.ts | 2 | ||||
| -rw-r--r-- | src/cdn/routes/attachments.ts | 2 | ||||
| -rw-r--r-- | src/cdn/routes/avatars.ts | 2 | ||||
| -rw-r--r-- | src/cdn/routes/guild-profiles.ts | 2 | ||||
| -rw-r--r-- | src/cdn/routes/role-icons.ts | 2 | ||||
| -rw-r--r-- | src/util/util/cdn.ts | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/api/routes/gateway/bot.ts b/src/api/routes/gateway/bot.ts index ffd58e21..070debe3 100644 --- a/src/api/routes/gateway/bot.ts +++ b/src/api/routes/gateway/bot.ts @@ -44,7 +44,7 @@ const options: RouteOptions = { router.get("/", route(options), (req: Request, res: Response) => { const { endpointPublic } = Config.get().gateway; res.json({ - url: endpointPublic || process.env.GATEWAY || "ws://localhost:3002", + url: endpointPublic || process.env.GATEWAY || "ws://localhost:3001", shards: 1, session_start_limit: { total: 1000, diff --git a/src/api/routes/gateway/index.ts b/src/api/routes/gateway/index.ts index a23c93ba..e6fcf5e3 100644 --- a/src/api/routes/gateway/index.ts +++ b/src/api/routes/gateway/index.ts @@ -37,7 +37,7 @@ const options: RouteOptions = { router.get("/", route(options), (req: Request, res: Response) => { const { endpointPublic } = Config.get().gateway; res.json({ - url: endpointPublic || process.env.GATEWAY || "ws://localhost:3002", + url: endpointPublic || process.env.GATEWAY || "ws://localhost:3001", }); }); diff --git a/src/api/routes/policies/instance/domains.ts b/src/api/routes/policies/instance/domains.ts index 33c06765..c95493b0 100644 --- a/src/api/routes/policies/instance/domains.ts +++ b/src/api/routes/policies/instance/domains.ts @@ -29,7 +29,7 @@ router.get("/", route({}), async (req: Request, res: Response) => { gateway: gateway.endpointPublic || process.env.GATEWAY || - "ws://localhost:3002", + "ws://localhost:3001", defaultApiVersion: api.defaultVersion ?? 9, apiEndpoint: api.endpointPublic ?? "/api", }; diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts index d7764bd7..398a243f 100644 --- a/src/cdn/routes/attachments.ts +++ b/src/cdn/routes/attachments.ts @@ -50,7 +50,7 @@ router.post( const path = `attachments/${channel_id}/${id}/${filename}`; const endpoint = - Config.get()?.cdn.endpointPublic || "http://localhost:3003"; + Config.get()?.cdn.endpointPublic || "http://localhost:3001"; await storage.set(path, buffer); let width; diff --git a/src/cdn/routes/avatars.ts b/src/cdn/routes/avatars.ts index 2c078c29..7dc23d60 100644 --- a/src/cdn/routes/avatars.ts +++ b/src/cdn/routes/avatars.ts @@ -63,7 +63,7 @@ router.post( const path = `avatars/${user_id}/${hash}`; const endpoint = - Config.get().cdn.endpointPublic || "http://localhost:3003"; + Config.get().cdn.endpointPublic || "http://localhost:3001"; await storage.set(path, buffer); diff --git a/src/cdn/routes/guild-profiles.ts b/src/cdn/routes/guild-profiles.ts index a02d152c..ae8786ae 100644 --- a/src/cdn/routes/guild-profiles.ts +++ b/src/cdn/routes/guild-profiles.ts @@ -59,7 +59,7 @@ router.post("/", multer.single("file"), async (req: Request, res: Response) => { if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash const path = `guilds/${guild_id}/users/${user_id}/avatars/${hash}`; - const endpoint = Config.get().cdn.endpointPublic || "http://localhost:3003"; + const endpoint = Config.get().cdn.endpointPublic || "http://localhost:3001"; await storage.set(path, buffer); diff --git a/src/cdn/routes/role-icons.ts b/src/cdn/routes/role-icons.ts index c3ad51c1..8f10ab78 100644 --- a/src/cdn/routes/role-icons.ts +++ b/src/cdn/routes/role-icons.ts @@ -62,7 +62,7 @@ router.post( const path = `role-icons/${role_id}/${hash}.png`; const endpoint = - Config.get().cdn.endpointPublic || "http://localhost:3003"; + Config.get().cdn.endpointPublic || "http://localhost:3001"; await storage.set(path, buffer); diff --git a/src/util/util/cdn.ts b/src/util/util/cdn.ts index 7f447c53..69d50159 100644 --- a/src/util/util/cdn.ts +++ b/src/util/util/cdn.ts @@ -36,7 +36,7 @@ export async function uploadFile( }); const response = await fetch( - `${Config.get().cdn.endpointPrivate || "http://localhost:3003"}${path}`, + `${Config.get().cdn.endpointPrivate || "http://localhost:3001"}${path}`, { headers: { signature: Config.get().security.requestSignature, @@ -75,7 +75,7 @@ export async function handleFile( export async function deleteFile(path: string) { const response = await fetch( - `${Config.get().cdn.endpointPrivate || "http://localhost:3003"}${path}`, + `${Config.get().cdn.endpointPrivate || "http://localhost:3001"}${path}`, { headers: { signature: Config.get().security.requestSignature, |