From e8e9bb722a58160f1cd8bcc4dd4b8ae91c37c62b Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 30 Sep 2025 05:45:27 +0200
Subject: [PATCH] Move discord-protos to regular deps, update patches

---
 hashes.json                                   |   2 +-
 package-lock.json                             | Bin 373107 -> 373075 bytes
 package.json                                  |   2 +-
 ...r+1.20.3.patch => body-parser+2.2.0.patch} |  14 +++++-----
 ...press+4.21.2.patch => express+5.1.0.patch} |  25 +++++-------------
 ...ch => typescript-json-schema+0.65.1.patch} |  14 +++++-----
 6 files changed, 23 insertions(+), 34 deletions(-)
 rename patches/{body-parser+1.20.3.patch => body-parser+2.2.0.patch} (74%)
 rename patches/{express+4.21.2.patch => express+5.1.0.patch} (69%)
 rename patches/{typescript-json-schema+0.50.1.patch => typescript-json-schema+0.65.1.patch} (58%)

diff --git a/hashes.json b/hashes.json
index 2926160b..3f314bfe 100644
--- a/hashes.json
+++ b/hashes.json
@@ -1,3 +1,3 @@
 {
-  "npmDepsHash": "sha256-JolEhCK62tYUQN2ID5g3e/sKDBXAat3Ek5yg7uu7RqY="
+  "npmDepsHash": "sha256-GgNaRWT7ZD5iUgWcKqCwzBuPgJDamsPh9SLB2aiQFgY="
 }
diff --git a/package-lock.json b/package-lock.json
index 1c6a213f8583c3171e1cf01ef13707a2bfa16fe9..f06df1a06875965682acc694019d1c8395fe1ac6 100644
GIT binary patch
delta 70
zcmV-M0J;D3;uh257O>y}lO+itm#JC>472M2IR}^R{{ahwPzkqC2>~fmlN-1Thm>0Z
cx0G7~mu{EKAO$OjX37GGX37J%X37K&=Lb9-LjV8(

delta 66
zcmccoNbK_?u?-Ixr*}oMa&P8gvSgoppHZ>dm2<l*C!<Nw^xrF3q}yAf8Mn7YGfmH%
WKKn6?b-UXsCLm_s?skfW_c;K7rW$Af

diff --git a/package.json b/package.json
index 246c5617..52b6da29 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
 		"@types/ws": "^8.18.1",
 		"@typescript-eslint/eslint-plugin": "^8.45.0",
 		"@typescript-eslint/parser": "^8.45.0",
-		"discord-protos": "^1.2.69",
 		"eslint": "^9.36.0",
 		"express": "^5.1.0",
 		"globals": "^16.4.0",
@@ -82,6 +81,7 @@
 		"cheerio": "^1.1.2",
 		"cookie-parser": "^1.4.7",
 		"dotenv": "^17.2.2",
+		"discord-protos": "^1.2.69",
 		"email-providers": "^2.15.0",
 		"exif-be-gone": "^1.5.1",
 		"fast-zlib": "^2.0.1",
diff --git a/patches/body-parser+1.20.3.patch b/patches/body-parser+2.2.0.patch
similarity index 74%
rename from patches/body-parser+1.20.3.patch
rename to patches/body-parser+2.2.0.patch
index 8f44efd0..a3399011 100644
--- a/patches/body-parser+1.20.3.patch
+++ b/patches/body-parser+2.2.0.patch
@@ -1,16 +1,16 @@
 diff --git a/node_modules/body-parser/lib/types/json.js b/node_modules/body-parser/lib/types/json.js
-index 59f3f7e..604f8b1 100644
+index 078ce71..af121b3 100644
 --- a/node_modules/body-parser/lib/types/json.js
 +++ b/node_modules/body-parser/lib/types/json.js
-@@ -18,6 +18,7 @@ var createError = require('http-errors')
- var debug = require('debug')('body-parser:json')
+@@ -17,6 +17,7 @@ var debug = require('debug')('body-parser:json')
+ var isFinished = require('on-finished').isFinished
  var read = require('../read')
  var typeis = require('type-is')
 +var JSONbig = require("json-bigint");
+ var { getCharset, normalizeOptions } = require('../utils')
  
  /**
-  * Module exports.
-@@ -89,7 +90,7 @@ function json (options) {
+@@ -74,7 +75,7 @@ function json (options) {
  
      try {
        debug('parse json')
@@ -19,7 +19,7 @@ index 59f3f7e..604f8b1 100644
      } catch (e) {
        throw normalizeJsonSyntaxError(e, {
          message: e.message,
-@@ -166,7 +167,7 @@ function createStrictSyntaxError (str, char) {
+@@ -153,7 +154,7 @@ function createStrictSyntaxError (str, char) {
    }
  
    try {
@@ -28,7 +28,7 @@ index 59f3f7e..604f8b1 100644
    } catch (e) {
      return normalizeJsonSyntaxError(e, {
        message: e.message.replace(JSON_SYNTAX_REGEXP, function (placeholder) {
-@@ -227,7 +228,7 @@ function normalizeJsonSyntaxError (error, obj) {
+@@ -199,7 +200,7 @@ function normalizeJsonSyntaxError (error, obj) {
    }
  
    // replace stack before message for Node.js 0.10 and below
diff --git a/patches/express+4.21.2.patch b/patches/express+5.1.0.patch
similarity index 69%
rename from patches/express+4.21.2.patch
rename to patches/express+5.1.0.patch
index c2d23550..70d9947e 100644
--- a/patches/express+4.21.2.patch
+++ b/patches/express+5.1.0.patch
@@ -1,8 +1,8 @@
 diff --git a/node_modules/express/lib/response.js b/node_modules/express/lib/response.js
-index 2b654f4..f09c95e 100644
+index 9362d0e..0f3ed6d 100644
 --- a/node_modules/express/lib/response.js
 +++ b/node_modules/express/lib/response.js
-@@ -27,7 +27,6 @@ var merge = require('utils-merge');
+@@ -25,7 +25,6 @@ var statuses = require('statuses')
  var sign = require('cookie-signature').sign;
  var normalizeType = require('./utils').normalizeType;
  var normalizeTypes = require('./utils').normalizeTypes;
@@ -10,16 +10,7 @@ index 2b654f4..f09c95e 100644
  var cookie = require('cookie');
  var send = require('send');
  var extname = path.extname;
-@@ -54,8 +53,6 @@ module.exports = res
-  * @private
-  */
- 
--var charsetRegExp = /;\s*charset\s*=/;
--
- /**
-  * Set status `code`.
-  *
-@@ -164,16 +161,6 @@ res.send = function send(body) {
+@@ -151,17 +150,6 @@ res.send = function send(body) {
        break;
    }
  
@@ -33,10 +24,11 @@ index 2b654f4..f09c95e 100644
 -      this.set('Content-Type', setCharset(type, 'utf-8'));
 -    }
 -  }
- 
+-
    // determine if ETag should be generated
    var etagFn = app.get('etag fn')
-@@ -780,17 +767,6 @@ res.header = function header(field, val) {
+   var generateETag = !this.get('ETag') && typeof etagFn === 'function'
+@@ -673,14 +661,6 @@ res.header = function header(field, val) {
        ? val.map(String)
        : String(val);
  
@@ -45,10 +37,7 @@ index 2b654f4..f09c95e 100644
 -      if (Array.isArray(value)) {
 -        throw new TypeError('Content-Type cannot be set to an Array');
 -      }
--      if (!charsetRegExp.test(value)) {
--        var charset = mime.charsets.lookup(value.split(';')[0]);
--        if (charset) value += '; charset=' + charset.toLowerCase();
--      }
+-      value = mime.contentType(value)
 -    }
 -
      this.setHeader(field, value);
diff --git a/patches/typescript-json-schema+0.50.1.patch b/patches/typescript-json-schema+0.65.1.patch
similarity index 58%
rename from patches/typescript-json-schema+0.50.1.patch
rename to patches/typescript-json-schema+0.65.1.patch
index a0d479de..2164d4a3 100644
--- a/patches/typescript-json-schema+0.50.1.patch
+++ b/patches/typescript-json-schema+0.65.1.patch
@@ -1,14 +1,14 @@
 diff --git a/node_modules/typescript-json-schema/dist/typescript-json-schema.js b/node_modules/typescript-json-schema/dist/typescript-json-schema.js
-index 47e1598..8397b9d 100644
+index 3eab401..69658a4 100644
 --- a/node_modules/typescript-json-schema/dist/typescript-json-schema.js
 +++ b/node_modules/typescript-json-schema/dist/typescript-json-schema.js
-@@ -432,6 +432,9 @@ var JsonSchemaGenerator = (function () {
+@@ -470,6 +470,9 @@ var JsonSchemaGenerator = (function () {
              else if (flags & ts.TypeFlags.Boolean) {
                  definition.type = "boolean";
              }
-+            else if (flags & ts.TypeFlags.BigInt) {
-+                definition.type = "bigint";
-+            }
-             else if (flags & ts.TypeFlags.Null) {
-                 definition.type = "null";
++			else if (flags & ts.TypeFlags.BigInt) {
++				definition.type = "bigint";
++			}
+             else if (flags & ts.TypeFlags.ESSymbol) {
+                 definition.type = "object";
              }