From 499cd2e8ff390da392263ffc5d2e34b644f6c714 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Fri, 5 Aug 2022 00:55:26 +0200 Subject: [PATCH] Fix ESM error caused by file-type --- bundle/package-lock.json | Bin 673527 -> 673261 bytes bundle/package.json | 2 +- cdn/package.json | 2 +- cdn/src/routes/attachments.ts | 2 +- cdn/src/routes/avatars.ts | 6 +++--- cdn/src/routes/external.ts | 2 +- cdn/src/routes/role-icons.ts | 6 +++--- package-lock.json | Bin 794061 -> 793798 bytes 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bundle/package-lock.json b/bundle/package-lock.json index c4058d817dd72dd32c41c1e56a0df0e25de7269d..14f05bcc18fb322596c1d748b7159d54e934cd61 100644 GIT binary patch delta 1220 zcmciAO=#0#7zc3HB-)HII}xX%_G>bxv&qu5Tjs?!X`6nmYu2WnJq)*greA4I+O88t z@lZtu%FyQ^!cGb@Vc;QnQuHW-pht%yh$8rP@?$Wpy9naNgTC+_-uHbDfByWwEDpWD zIJ6o=&=IH20fra2_0DPJLeJ*)T(6i`ZpQsnpfheDr z*^)%Zb3!PSF9g)4;I7olN-(t~*i3MoLk8g8L!@U=m5X-ExXCi(v{5$NGTe=Kj-~UO zsT@{Y)r_+FNyAYTIRqcipyS{-AwBJw2hn04bR!Ed{fHeFSJ3@nuIdNGq~9K@G{uIa zGU=NW7C0tFNu1BA%K1!vI+~0)GD?(p7v!ok&C}`J2&2gLY@;grT=u%0mmISduj-ql zN_kg2%`foIDZR(xEGuP6NuA6x&O#}$i8>3EO&A5%-RSVoGK{~Xz{)Vz4Y$_tSMcby zZl_kVV9(6(1jSIuZRiL%$zglo{)TQqbk@^uiWWxgqasH{IVI@g{fw8Lij2BzDTX5^ z1TjuhlT$*@At}Xz8VZz>fp9uZ7lUdltv1a3;94 zj`xG?!Hn?fD`NhYus!I-v_bEd?{7B=F7+DTw6~F4wQZ#S!T6v2#r}mq_T=r6Q~14^|HZ3@bc&JJaWgEMusg-0&mQoP!QE{Wk2P>S(AAODn9V>VUc_sPzGyyI>{2 zv~GvNGzWECe86FWc1hF(UX4joI;gQ+wjlFIsSp$6;uG0etjJO9n8pmH-HGz#*kB~e zM%Zx7AVoDJb9{jCXA`oaRAdS-CDLA2^Sje$NkI!tYR!2U3hv%S5D

vm%YQEY(n z5FRhKZynM)*l4XL>Y7_WsUWU5>%i;SDsC4=UD1W~~?JjI2^()C)>&ER@i&?Zy4B0d_Y@r+7y zlVmdJO%=ty;bKN&LiO}`HX82>45cf;c?;hC>$zRv^jw@qKDVHi4r<;|NPO#VmQ(bKgco=Z~ zjm5Pl{L5>Ytu=P+YDc{}|B?W69K3Y}=(DbMm^dooZ 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 b37fec3e84b03107140db4d3cde26a42c039a8a9..48f8206d6dd579df9a23e2383db6bebe965f0471 100644 GIT binary patch delta 1133 zcmciAJ7^OD9LI4kmy0>0(4t_iTGBV7ZLZ1X+MDdK?lVlTPJaof;j1DHFR+iH#_{6|Mcb0=i@8l-67F_YShk9 z)7FiBV{_k#^rlhwjVL0ay(2K|8Ulg`_!WeLhjDyVFg0APkBGT*E@#H!%{hHRq8zc8 z^K#G?%+?y|TB@2hmBV$>PbdW^$!Hanv4mUga1&o?DPm|EyMh6fQ+9TL4==+Y)&D9-LUER?hAH(i| zMhm-ps0p%n3`5Y}L&t=u$HEnBLe*Lfxa0hqgHD)5hnrGL*;HjY6b)Kaa)`C%N@aPO zC6k#MS}s-6)w1AbER|ALw8n}q#T_^2vrIV2uCdgj$yu!e^FuQZpFuMOCl64)`nZm5 zZi4gyBjMgptRJCT{o|uTI;zC8O4UPq$ho>B)Tkv*a;e~7$p~!T%$XCiQdqXz#WW!* zfiz9!QjwXt1zV`G%2oVg;w~SSs^vgkiYn4tB_}R*LcgRLfvatUx%UL*K;u0v zfL_58yfo-A_0liw(*!(WPz&6i&<(=8f{zJQC22F0{H$eGaF{|4*~hRR+GSr1&e~QI zw8ON(3t_?>SmZNSQI>KF=gmjG{-mFjd`cpz)aa=!tn%Y&5w delta 1532 zcmchX&1=(O9LMR}bjzY1L}5(F(&{F%EicWRRW?oAG+o=RscX_T$S}HgYq~aV*VkeT=y2D@-4$1J#bvXs!(4IMdv&`d0NNHT+Bguu=R74-HM|^_ zWyzIp*lq*J#a-T=tGaN=>#E7;~oYye# z4}rCtE{s$f#q{EVi1{f3w$F|;VC!^;}Fui@$nPDmk`ML{S}~z2nnv%pgyGa+E;m}OD=|u`5;~i)D)^vDI}O7AtxKOz!5|V z*YTJ?P?hSHi6I8h1x39P)3W$tgvOI;+TS22e4bb~5nsqAWhPLUZluN|aeh`R@!-*} z7q^-FX=csc02Vm_!t#4^$nmi0$_1laom9c^6%_Xlh)Sv;4l>%O3#P&uw* zD8j-GGRx&C-9J5<^Z7_RsAwwAM#p104Nr;&9o3lWP_!&_g>+Df&PJ|H3sY)__N8?t zqE?x_7Rwvg*W;@$aCQ@++Ts%*vwaWypEv>f5hnzyo5+XtmChdX&R6K&KwA!W19k$y zJ4kQa8*h6$T(YnzdgVHwq$gN~Pm~2gpO=D(h#+UlST8g)n zb41Z{p9-l{`Q&9IlqcgEb*?-|r3p`_SmG;82HdaN-Qf8S!hzd^&i+5iM$^iMWu4~B z!7dln##7Vc$wY_YvE^SGO8g6kz%F#C58%Bp43dwbqtXEqlvU+_1t`n|$SwF-b7LDe zH@3T