Update patches

5 files changed, 22 insertions, 19 deletions

diff --git a/0001-Remove-donator-badges.patch b/0001-Remove-donator-badges.patch
index 1af5b96..d0c8a3a 100644
--- a/0001-Remove-donator-badges.patch
+++ b/0001-Remove-donator-badges.patch
@@ -1,4 +1,4 @@
-From 191cf11a7bb70b3a213be50e85bbb0ccdbfbcf67 Mon Sep 17 00:00:00 2001
+From 20c2287a47b2e547e83447505a8e580b7d71cf0b Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Mon, 9 Oct 2023 17:46:41 +0100
 Subject: [PATCH 1/5] Remove donator badges
@@ -146,5 +146,5 @@ index 16b244a..4328925 100644
 +    }, { noop: true })
  });
 -- 
-2.43.1
+2.44.0
 
diff --git a/0002-Small-rebrand.patch b/0002-Small-rebrand.patch
index 1052397..6c983f3 100644
--- a/0002-Small-rebrand.patch
+++ b/0002-Small-rebrand.patch
@@ -1,4 +1,4 @@
-From 50d952d0728b6ec9a096acb36e6096f862e185b4 Mon Sep 17 00:00:00 2001
+From f7c8732658d67fae6495e8e3db7aee9e29dd2fb1 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Tue, 13 Feb 2024 21:26:56 +0000
 Subject: [PATCH 2/5] Small rebrand
@@ -117,10 +117,10 @@ index ab910ea..8bf18f2 100644
  type KeysOfType<Object, Type> = {
      [K in keyof Object]: Object[K] extends Type ? K : never;
 diff --git a/src/plugins/vencordToolbox/index.tsx b/src/plugins/vencordToolbox/index.tsx
-index 0a805a0..a8e2d87 100644
+index 00805fb..7983052 100644
 --- a/src/plugins/vencordToolbox/index.tsx
 +++ b/src/plugins/vencordToolbox/index.tsx
-@@ -85,10 +85,10 @@ function VencordPopout(onClose: () => void) {
+@@ -86,10 +86,10 @@ function VencordPopout(onClose: () => void) {
      );
  }
  
@@ -134,7 +134,7 @@ index 0a805a0..a8e2d87 100644
          </svg>
      );
  }
-@@ -109,8 +109,8 @@ function VencordPopoutButton() {
+@@ -110,8 +110,8 @@ function VencordPopoutButton() {
                  <HeaderBarIcon
                      className="vc-toolbox-btn"
                      onClick={() => setShow(v => !v)}
@@ -146,5 +146,5 @@ index 0a805a0..a8e2d87 100644
                  />
              )}
 -- 
-2.43.1
+2.44.0
 
diff --git a/0003-Experiments-Re-add-staging-banner.patch b/0003-Experiments-Re-add-staging-banner.patch
index 4beacd8..a6bfc15 100644
--- a/0003-Experiments-Re-add-staging-banner.patch
+++ b/0003-Experiments-Re-add-staging-banner.patch
@@ -1,4 +1,4 @@
-From e652044d200bd28b1a6fb214f2a8f33797471238 Mon Sep 17 00:00:00 2001
+From 0c5477d6f5444c20ff901683fccd78e26d7a1542 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Thu, 26 Oct 2023 00:48:25 +0100
 Subject: [PATCH 3/5] Experiments: Re-add staging banner
@@ -41,5 +41,5 @@ index f8ea4b0..dc4f78f 100644
              find: 'H1,title:"Experiments"',
              replacement: {
 -- 
-2.43.1
+2.44.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 b90d0c7..0910bec 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,27 +1,30 @@
-From 917df10a7d166fdfb4479ee28c40cb884bfc37dc Mon Sep 17 00:00:00 2001
+From 00aba2082b64d8f01ea796f1118030bd944ebcc6 Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Wed, 11 Oct 2023 15:55:03 +0100
 Subject: [PATCH 4/5] Updater: don't prompt for updates when on a local branch
 
 ---
- src/main/updater/git.ts | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ src/main/updater/git.ts | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
-index 2ff3ba5..21f33d1 100644
+index 20a5d70..21f33d1 100644
 --- a/src/main/updater/git.ts
 +++ b/src/main/updater/git.ts
-@@ -49,9 +49,7 @@ async function getRepo() {
+@@ -49,12 +49,7 @@ async function getRepo() {
  async function calculateGitChanges() {
      await git("fetch");
  
--    const branch = await git("branch", "--show-current");
+-    const branch = (await git("branch", "--show-current")).stdout.trim();
 -
--    const res = await git("log", `HEAD...origin/${branch.stdout.trim()}`, "--pretty=format:%an/%h/%s");
+-    const existsOnOrigin = (await git("ls-remote", "origin", branch)).stdout.length > 0;
+-    if (!existsOnOrigin) return [];
+-
+-    const res = await git("log", `HEAD...origin/${branch}`, "--pretty=format:%an/%h/%s");
 +    const res = await git("log", "HEAD...@{u}", "--pretty=format:%an/%h/%s");
  
      const commits = res.stdout.trim();
      return commits ? commits.split("\n").map(line => {
 -- 
-2.43.1
+2.44.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 7be02d7..06ba633 100644
--- a/0005-Enable-CSP-bypass-on-stock-discord-desktop-client.patch
+++ b/0005-Enable-CSP-bypass-on-stock-discord-desktop-client.patch
@@ -1,4 +1,4 @@
-From a88292149ce6bf585d2340774ab605ac88ebb742 Mon Sep 17 00:00:00 2001
+From e59ce67472e747ae336eae0591ec3869f1d1002b Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
 Date: Wed, 27 Dec 2023 15:05:44 +0000
 Subject: [PATCH 5/5] Enable CSP bypass on stock discord desktop client
@@ -25,5 +25,5 @@ index 481736a..33dbe3f 100644
              let url = unsafeUrl.slice("vencord://".length);
              if (url.endsWith("/")) url = url.slice(0, -1);
 -- 
-2.43.1
+2.44.0