Remove last patch (fixed by upstream)

7 files changed, 31 insertions, 61 deletions

diff --git a/0001-Remove-donator-badges.patch b/0001-Remove-donator-badges.patch
index e77716c..cea6464 100644
--- a/0001-Remove-donator-badges.patch
+++ b/0001-Remove-donator-badges.patch
@@ -1,18 +1,18 @@
-From e25f5674bfbfe3d6a28f8536b857c0d1b9db6a9d Mon Sep 17 00:00:00 2001
+From 6f4d3bbe8c52828bdabd4e780b111b99fcba8959 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Wed, 24 Apr 2024 23:30:05 +0100
-Subject: [PATCH 1/7] Remove donator badges
+Subject: [PATCH 1/6] Remove donator badges
 
 It makes a request to an API hosted by the Vencord developer, without
 any option to turn it off. This raises privacy concerns.
 It's easiest to just get rid of the feature entirely.
 ---
- src/api/Badges.ts           |  3 +-
- src/plugins/_api/badges.tsx | 95 -------------------------------------
+ src/api/Badges.ts                 |  3 +-
+ src/plugins/_api/badges/index.tsx | 95 -------------------------------
  2 files changed, 1 insertion(+), 97 deletions(-)
 
 diff --git a/src/api/Badges.ts b/src/api/Badges.ts
-index b50016c..3529693 100644
+index 061bdeb..bc9e887 100644
 --- a/src/api/Badges.ts
 +++ b/src/api/Badges.ts
 @@ -79,8 +79,7 @@ export function _getBadges(args: BadgeUserArgs) {
@@ -25,12 +25,12 @@ index b50016c..3529693 100644
  
      return badges;
  }
-diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges.tsx
-index 6b1a79c..27da6fa 100644
---- a/src/plugins/_api/badges.tsx
-+++ b/src/plugins/_api/badges.tsx
-@@ -44,19 +44,6 @@ const ContributorBadge: ProfileBadge = {
-     link: "https://github.com/Vendicated/Vencord"
+diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx
+index bbccf0a..7bbe430 100644
+--- a/src/plugins/_api/badges/index.tsx
++++ b/src/plugins/_api/badges/index.tsx
+@@ -41,19 +41,6 @@ const ContributorBadge: ProfileBadge = {
+     onClick: (_, { user }) => openContributorModal(user)
  };
  
 -let DonorBadges = {} as Record<string, Array<Record<"tooltip" | "badge", string>>>;
@@ -49,7 +49,7 @@ index 6b1a79c..27da6fa 100644
  export default definePlugin({
      name: "BadgeAPI",
      description: "API to add badges to users.",
-@@ -91,94 +78,12 @@ export default definePlugin({
+@@ -88,94 +75,12 @@ export default definePlugin({
          }
      ],
  
@@ -145,5 +145,5 @@ index 6b1a79c..27da6fa 100644
 -    }
  });
 -- 
-2.44.0
+2.45.0
 
diff --git a/0002-Small-rebrand.patch b/0002-Small-rebrand.patch
index db4c699..1873b68 100644
--- a/0002-Small-rebrand.patch
+++ b/0002-Small-rebrand.patch
@@ -1,7 +1,7 @@
-From 1488ae2e8e1b16bfe19f93d840e9c4af2827f48d Mon Sep 17 00:00:00 2001
+From 3a26a9789a6766f936ee3fa42ec1114237349ba1 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Sat, 9 Mar 2024 07:57:26 +0000
-Subject: [PATCH 2/7] Small rebrand
+Subject: [PATCH 2/6] Small rebrand
 
 There's a litevex in here! It's got my gun!!! AHHHHHHHH
 ---
@@ -146,5 +146,5 @@ index 00805fb..7d935f4 100644
                  />
              )}
 -- 
-2.44.0
+2.45.0
 
diff --git a/0003-Experiments-Re-add-staging-banner.patch b/0003-Experiments-Re-add-staging-banner.patch
index 91a99cb..5158801 100644
--- a/0003-Experiments-Re-add-staging-banner.patch
+++ b/0003-Experiments-Re-add-staging-banner.patch
@@ -1,7 +1,7 @@
-From 54fb224b90ddb97807dc91072769ccebacf9e426 Mon Sep 17 00:00:00 2001
+From 874e752ee215ea3aa91861f68e9694f67a502439 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Thu, 26 Oct 2023 00:48:25 +0100
-Subject: [PATCH 3/7] Experiments: Re-add staging banner
+Subject: [PATCH 3/6] Experiments: Re-add staging banner
 
 (it's funny)
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 3/7] Experiments: Re-add staging banner
  1 file changed, 14 insertions(+)
 
 diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
-index 3446388..7902f3e 100644
+index 50b9521..4d7a9ca 100644
 --- a/src/plugins/experiments/index.tsx
 +++ b/src/plugins/experiments/index.tsx
-@@ -33,6 +33,12 @@ const settings = definePluginSettings({
+@@ -35,6 +35,12 @@ const settings = definePluginSettings({
          type: OptionType.BOOLEAN,
          default: false,
          restartNeeded: true
@@ -25,7 +25,7 @@ index 3446388..7902f3e 100644
      }
  });
  
-@@ -77,6 +83,14 @@ export default definePlugin({
+@@ -79,6 +85,14 @@ export default definePlugin({
                  }
              ]
          },
@@ -41,5 +41,5 @@ index 3446388..7902f3e 100644
              find: 'H1,title:"Experiments"',
              replacement: {
 -- 
-2.44.0
+2.45.0
 
diff --git a/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch b/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch
index 3a03aa7..f9c26e4 100644
--- a/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch
+++ b/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch
@@ -1,7 +1,7 @@
-From 7aa6223d4b8a9a9c2e5329e5196a6a0cd23e1097 Mon Sep 17 00:00:00 2001
+From b7338cfdaab929af2dad6d202a237ed824ad58b2 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Sat, 9 Mar 2024 08:00:55 +0000
-Subject: [PATCH 4/7] Updater: don't prompt for updates when on a local branch
+Subject: [PATCH 4/6] Updater: don't prompt for updates when on a local branch
 
 ---
  src/main/updater/git.ts | 7 +------
@@ -26,5 +26,5 @@ index 1955f7d..0226565 100644
      const commits = res.stdout.trim();
      return commits ? commits.split("\n").map(line => {
 -- 
-2.44.0
+2.45.0
 
diff --git a/0005-Enable-CSP-bypass-on-stock-discord-desktop-client.patch b/0005-Enable-CSP-bypass-on-stock-discord-desktop-client.patch
index d8a5a94..691dd90 100644
--- a/0005-Enable-CSP-bypass-on-stock-discord-desktop-client.patch
+++ b/0005-Enable-CSP-bypass-on-stock-discord-desktop-client.patch
@@ -1,7 +1,7 @@
-From ca457c1263004f0c9347e2e830a088f93b95e824 Mon Sep 17 00:00:00 2001
+From d9eee32aebb1f153598c53106cac09625b3515c2 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Wed, 27 Dec 2023 15:05:44 +0000
-Subject: [PATCH 5/7] Enable CSP bypass on stock discord desktop client
+Subject: [PATCH 5/6] Enable CSP bypass on stock discord desktop client
 
 ---
  src/main/index.ts | 3 ++-
@@ -25,5 +25,5 @@ index 5519d47..64e71c1 100644
              let url = unsafeUrl.slice("vencord://".length);
              if (url.endsWith("/")) url = url.slice(0, -1);
 -- 
-2.44.0
+2.45.0
 
diff --git a/0006-Updater-Disable-auto-update-by-default.patch b/0006-Updater-Disable-auto-update-by-default.patch
index 0b28abf..79c0be6 100644
--- a/0006-Updater-Disable-auto-update-by-default.patch
+++ b/0006-Updater-Disable-auto-update-by-default.patch
@@ -1,7 +1,7 @@
-From 111bf8d5fad4f9226122583239b38eb718b57b04 Mon Sep 17 00:00:00 2001
+From cdbd25f4d76bf0a7fbf57c26b3ce14cd8f90f5f4 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Sun, 21 Apr 2024 21:22:25 +0100
-Subject: [PATCH 6/7] Updater: Disable auto-update by default
+Subject: [PATCH 6/6] Updater: Disable auto-update by default
 
 ---
  src/api/Settings.ts | 2 +-
@@ -21,5 +21,5 @@ index 696c12c..4503011 100644
      useQuickCss: true,
      themeLinks: [],
 -- 
-2.44.0
+2.45.0
 
diff --git a/0007-Build-Don-t-use-import-assertions.patch b/0007-Build-Don-t-use-import-assertions.patch
deleted file mode 100644
index 6e43e48..0000000
--- a/0007-Build-Don-t-use-import-assertions.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 88417678f3b38b3f2af056f2a34f9c6eb99d591f Mon Sep 17 00:00:00 2001
-From: 1024x2 <2pow11@gmail.com>
-Date: Fri, 26 Apr 2024 13:56:19 +0100
-Subject: [PATCH 7/7] Build: Don't use import assertions
-
-Node.js 22 removed the "assert" syntax because we obviously can't keep
-things working for more than 5 minutes.
-We can just call readFileSync instead, which works on all currently
-supported Node.js versions.
----
- scripts/build/common.mjs | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
-index 5c34ad0..ff9b854 100644
---- a/scripts/build/common.mjs
-+++ b/scripts/build/common.mjs
-@@ -25,8 +25,7 @@ import { access, readdir, readFile } from "fs/promises";
- import { join, relative } from "path";
- import { promisify } from "util";
- 
--// wtf is this assert syntax
--import PackageJSON from "../../package.json" assert { type: "json" };
-+const PackageJSON = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url), "utf-8"));
- import { getPluginTarget } from "../utils.mjs";
- 
- export const VERSION = PackageJSON.version;
--- 
-2.44.0
-