From 168758924ccc62c8aeef7b5737ca60c1b6f678a7 Mon Sep 17 00:00:00 2001 From: "Emma [it/its]@Rory&" Date: Tue, 15 Oct 2024 12:20:41 +0200 Subject: [PATCH] Update some patches, switch to node-fetch-commonjs, more updates --- assets/schemas.json | Bin 22177576 -> 23947401 bytes hashes.json | 2 +- package-lock.json | Bin 379212 -> 381269 bytes package.json | 4 +-- ...+1.20.1.patch => body-parser+1.20.3.patch} | 12 +++---- ...ress+4.19.2.patch => express+4.21.1.patch} | 13 ++++---- src/api/middlewares/ImageProxy.ts | 2 +- src/api/routes/gifs/search.ts | 11 +++++-- src/api/routes/gifs/trending-gifs.ts | 11 +++++-- src/api/routes/gifs/trending.ts | 2 +- src/api/routes/guilds/templates/index.ts | 2 +- src/api/util/handlers/Message.ts | 2 +- src/api/util/utility/EmbedHandlers.ts | 30 +++++++++++++++--- src/api/util/utility/captcha.ts | 2 +- src/api/util/utility/ipAddress.ts | 4 +-- src/util/util/AutoUpdate.ts | 4 +-- src/util/util/cdn.ts | 2 +- 17 files changed, 67 insertions(+), 36 deletions(-) rename patches/{body-parser+1.20.1.patch => body-parser+1.20.3.patch} (80%) rename patches/{express+4.19.2.patch => express+4.21.1.patch} (84%) diff --git a/assets/schemas.json b/assets/schemas.json index 6681e6955eb0b57fe5447f395311a0763bdd4d49..9d9b7c09a2b77e98157664db14943d1f10a337b7 100644 GIT binary patch delta 36170 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 Z#a>VUoS^^uSnc2nf;`}SrQnG-{tNPP8iN1; diff --git a/hashes.json b/hashes.json index 2ecf7662..613da98a 100644 --- a/hashes.json +++ b/hashes.json @@ -1,3 +1,3 @@ { - "npmDepsHash": "sha256-7dAZmZ8yLaUsDavaX9Fw2RYK/lV4Yy4PIDqfLjh29cg=" + "npmDepsHash": "sha256-KuKvhybhYGxC6oiVUxyjdEQD4xalXZ3OxT4KJ49ROAw=" } diff --git a/package-lock.json b/package-lock.json index d28557d18f29565320f3da62aa7172a7e3107cee..1978d84491628d8e766d7c7c090c57a76d47fe96 100644 GIT binary patch delta 810 zcmZuv%WD&H5N02tHdd_^TR~cr6fD*5J0XdJn0J$G%qDG;W|6`s-K4wO&2DzrrYTVh zf)#IC;peSdy=r^Q{~*$XD0onO+!QPH=FyN^Xr%*lneUq!zHjF3)e+s;PnagSLe-LU!ti9my}o799L1Std|CR6OadJd#KHK*!SMC zDV)Sf*Oa}#8?L5U!c5B$1=YlKO=(pmMcID|usVfIf@eFh?M#>NXty2nlpCiQoLb*{ zISCx^p&Rzz5qq-0HxzZQZSLgonY@1 z?946Di2@svmQ=ntI}_KcqCaI;qaog~JYFg&)yjofu_lM8+M=SAX2q})Yw&c~w-ok8 p2qhu-3b8_|7244fOJ|d$XdDHg&(qBdD4`u)W delta 93 zcmcb*Nc_ws@eM_ci;EeVxs { return ( await fetch(`https://api.ipdata.co/${ip}?api-key=${ipdataApiKey}`) - ).json(); + ).json() as Promise; } export function isProxy(data: typeof exampleData) { diff --git a/src/util/util/AutoUpdate.ts b/src/util/util/AutoUpdate.ts index 2af5cf1c..b7721cdb 100644 --- a/src/util/util/AutoUpdate.ts +++ b/src/util/util/AutoUpdate.ts @@ -17,7 +17,7 @@ */ import "missing-native-js-functions"; -import fetch from "node-fetch"; +import fetch from "node-fetch-commonjs"; import { ProxyAgent } from "proxy-agent"; import readline from "readline"; import fs from "fs/promises"; @@ -100,7 +100,7 @@ async function getLatestVersion(url: string) { try { const agent = new ProxyAgent(); const response = await fetch(url, { agent }); - const content = await response.json(); + const content = (await response.json()) as { version: string }; return content.version; } catch (error) { throw new Error("[Auto update] check failed for " + url); diff --git a/src/util/util/cdn.ts b/src/util/util/cdn.ts index f7d310a3..d5ca9ba9 100644 --- a/src/util/util/cdn.ts +++ b/src/util/util/cdn.ts @@ -18,7 +18,7 @@ import FormData from "form-data"; import { HTTPError } from "lambert-server"; -import fetch from "node-fetch"; +import fetch from "node-fetch-commonjs"; import { Attachment } from "../entities"; import { Config } from "./Config";