diff --git a/bundle/package-lock.json b/bundle/package-lock.json index c4058d817..14f05bcc1 100644 Binary files a/bundle/package-lock.json and b/bundle/package-lock.json differ diff --git a/bundle/package.json b/bundle/package.json index 6d0b58656..e574af3d0 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -69,7 +69,7 @@ "dotenv": "^16.0.1", "exif-be-gone": "^1.3.0", "express": "^4.17.1", - "file-type": "^17.1.4", + "file-type": "16.5", "form-data": "^4.0.0", "i18next": "^21.8.14", "i18next-http-middleware": "^3.1.3", diff --git a/cdn/package.json b/cdn/package.json index 541f5ee2b..4ee0be6a8 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -36,7 +36,7 @@ "dotenv": "^16.0.1", "exif-be-gone": "^1.3.0", "express": "^4.17.1", - "file-type": "^17.1.4", + "file-type": "16.5", "image-size": "^1.0.0", "jest": "^28.1.3", "lambert-server": "^1.2.12", diff --git a/cdn/src/routes/attachments.ts b/cdn/src/routes/attachments.ts index 3e04fe76a..723a6c03c 100644 --- a/cdn/src/routes/attachments.ts +++ b/cdn/src/routes/attachments.ts @@ -68,7 +68,7 @@ router.get( `attachments/${channel_id}/${id}/${filename}` ); if (!file) throw new HTTPError("File not found"); - const type = await FileType.fileTypeFromBuffer(file); + const type = await FileType.fromBuffer(file); let content_type = type?.mime || "application/octet-stream"; if (SANITIZED_CONTENT_TYPE.includes(content_type)) { diff --git a/cdn/src/routes/avatars.ts b/cdn/src/routes/avatars.ts index bbdf42cc7..40705b2e8 100644 --- a/cdn/src/routes/avatars.ts +++ b/cdn/src/routes/avatars.ts @@ -38,7 +38,7 @@ router.post( .update(Snowflake.generate()) .digest("hex"); - const type = await FileType.fileTypeFromBuffer(buffer); + const type = await FileType.fromBuffer(buffer); if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type"); if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash @@ -65,7 +65,7 @@ router.get("/:user_id", async (req: Request, res: Response) => { const file = await storage.get(path); if (!file) throw new HTTPError("not found", 404); - const type = await FileType.fileTypeFromBuffer(file); + const type = await FileType.fromBuffer(file); res.set("Content-Type", type?.mime); res.set("Cache-Control", "public, max-age=31536000"); @@ -80,7 +80,7 @@ router.get("/:user_id/:hash", async (req: Request, res: Response) => { const file = await storage.get(path); if (!file) throw new HTTPError("not found", 404); - const type = await FileType.fileTypeFromBuffer(file); + const type = await FileType.fromBuffer(file); res.set("Content-Type", type?.mime); res.set("Cache-Control", "public, max-age=31536000"); diff --git a/cdn/src/routes/external.ts b/cdn/src/routes/external.ts index cf02f645b..c9441fc23 100644 --- a/cdn/src/routes/external.ts +++ b/cdn/src/routes/external.ts @@ -48,7 +48,7 @@ router.get("/:id", async (req: Request, res: Response) => { const file = await storage.get(`/external/${id}`); if (!file) throw new HTTPError("File not found"); - const result = await FileType.fileTypeFromBuffer(file); + const result = await FileType.fromBuffer(file); res.set("Content-Type", result?.mime); diff --git a/cdn/src/routes/role-icons.ts b/cdn/src/routes/role-icons.ts index dd96c90e6..2e5c42dd6 100644 --- a/cdn/src/routes/role-icons.ts +++ b/cdn/src/routes/role-icons.ts @@ -38,7 +38,7 @@ router.post( .update(Snowflake.generate()) .digest("hex"); - const type = await FileType.fileTypeFromBuffer(buffer); + const type = await FileType.fromBuffer(buffer); if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type"); @@ -64,7 +64,7 @@ router.get("/:role_id", async (req: Request, res: Response) => { const file = await storage.get(path); if (!file) throw new HTTPError("not found", 404); - const type = await FileType.fileTypeFromBuffer(file); + const type = await FileType.fromBuffer(file); res.set("Content-Type", type?.mime); res.set("Cache-Control", "public, max-age=31536000, must-revalidate"); @@ -79,7 +79,7 @@ router.get("/:role_id/:hash", async (req: Request, res: Response) => { const file = await storage.get(path); if (!file) throw new HTTPError("not found", 404); - const type = await FileType.fileTypeFromBuffer(file); + const type = await FileType.fromBuffer(file); res.set("Content-Type", type?.mime); res.set("Cache-Control", "public, max-age=31536000, must-revalidate"); diff --git a/package-lock.json b/package-lock.json index b37fec3e8..48f8206d6 100644 Binary files a/package-lock.json and b/package-lock.json differ