From 63fa34a1c2713a7ba0a85e852766cb0aa49fcc86 Mon Sep 17 00:00:00 2001 From: 1024x2 Date: Sat, 9 Mar 2024 08:06:17 +0000 Subject: Tweak toolbox icon, make Updater not show local changes as updates --- 0002-Small-rebrand.patch | 8 ++++---- 0003-Experiments-Re-add-staging-banner.patch | 2 +- 0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch | 8 ++++---- 0005-Enable-CSP-bypass-on-stock-discord-desktop-client.patch | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/0002-Small-rebrand.patch b/0002-Small-rebrand.patch index 6c983f3..82c6c57 100644 --- a/0002-Small-rebrand.patch +++ b/0002-Small-rebrand.patch @@ -1,6 +1,6 @@ -From f7c8732658d67fae6495e8e3db7aee9e29dd2fb1 Mon Sep 17 00:00:00 2001 +From a6614a12fbccac52ec538ebcb999115e01c2b545 Mon Sep 17 00:00:00 2001 From: 1024x2 <2pow11@gmail.com> -Date: Tue, 13 Feb 2024 21:26:56 +0000 +Date: Sat, 9 Mar 2024 07:57:26 +0000 Subject: [PATCH 2/5] Small rebrand There's a litevex in here! It's got my gun!!! AHHHHHHHH @@ -117,7 +117,7 @@ index ab910ea..8bf18f2 100644 type KeysOfType = { [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 00805fb..7983052 100644 +index 00805fb..7d935f4 100644 --- a/src/plugins/vencordToolbox/index.tsx +++ b/src/plugins/vencordToolbox/index.tsx @@ -86,10 +86,10 @@ function VencordPopout(onClose: () => void) { @@ -130,7 +130,7 @@ index 00805fb..7983052 100644 - - + -+ ++ ); } diff --git a/0003-Experiments-Re-add-staging-banner.patch b/0003-Experiments-Re-add-staging-banner.patch index a6bfc15..3cd77a9 100644 --- a/0003-Experiments-Re-add-staging-banner.patch +++ b/0003-Experiments-Re-add-staging-banner.patch @@ -1,4 +1,4 @@ -From 0c5477d6f5444c20ff901683fccd78e26d7a1542 Mon Sep 17 00:00:00 2001 +From 0ea72960030d81dda7b2d8b90c52c3e47b4c561d 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 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 0910bec..aa35d25 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,6 +1,6 @@ -From 00aba2082b64d8f01ea796f1118030bd944ebcc6 Mon Sep 17 00:00:00 2001 +From ef30d1ed8a99d97556a31b5bb2e9d0f6019bb49a Mon Sep 17 00:00:00 2001 From: 1024x2 <2pow11@gmail.com> -Date: Wed, 11 Oct 2023 15:55:03 +0100 +Date: Sat, 9 Mar 2024 08:00:55 +0000 Subject: [PATCH 4/5] Updater: don't prompt for updates when on a local branch --- @@ -8,7 +8,7 @@ Subject: [PATCH 4/5] Updater: don't prompt for updates when on a local branch 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts -index 20a5d70..21f33d1 100644 +index 20a5d70..c530e67 100644 --- a/src/main/updater/git.ts +++ b/src/main/updater/git.ts @@ -49,12 +49,7 @@ async function getRepo() { @@ -21,7 +21,7 @@ index 20a5d70..21f33d1 100644 - 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 res = await git("log", "HEAD..@{u}", "--pretty=format:%an/%h/%s"); const commits = res.stdout.trim(); return commits ? commits.split("\n").map(line => { 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 06ba633..3a75ff8 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 e59ce67472e747ae336eae0591ec3869f1d1002b Mon Sep 17 00:00:00 2001 +From 4eeba2e6c80371b433e9f0d741c21d6e79fd5fb8 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 -- cgit v1.2.3