Update patches

Rebased onto commit cb2848f186f3d074d1a3390643aba70fa481eb6b
This commit is contained in:
1024x2 2024-09-24 17:08:57 +01:00
parent 2e462229f8
commit 7c16e8d1d6
Signed by: 1024x2
GPG Key ID: DEF24F6555C1934C
8 changed files with 26 additions and 25 deletions

@ -1,4 +1,4 @@
From 84e0fc4685dbddc3cba70fff6df67bc4caaf1a35 Mon Sep 17 00:00:00 2001
From 412e2a5246226a3f2b330d62eb9a04fec7ae7cdb Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Wed, 24 Apr 2024 23:30:05 +0100
Subject: [PATCH 1/8] Remove donator badges
@ -146,5 +146,5 @@ index c44d98b..28a7edb 100644
- }
});
--
2.46.0
2.46.1

@ -1,4 +1,4 @@
From a8e3c2075358c6d311959c37a64b5ab5adb4ba18 Mon Sep 17 00:00:00 2001
From f9329b5410af89414658bfa063fde81052dcfaf4 Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Sat, 8 Jun 2024 22:58:09 +0100
Subject: [PATCH 2/8] Small rebrand
@ -148,5 +148,5 @@ index 00805fb..7d935f4 100644
/>
)}
--
2.46.0
2.46.1

@ -1,4 +1,4 @@
From 068810e120c3a9156540662650886caf887b60a7 Mon Sep 17 00:00:00 2001
From e3f248dc270bf91a3977bc221f60d9d457a779cb Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Thu, 13 Jun 2024 01:00:35 +0100
Subject: [PATCH 3/8] Experiments: Re-add staging banner
@ -9,24 +9,25 @@ Subject: [PATCH 3/8] Experiments: Re-add staging banner
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index 33c32b1..2992807 100644
index 82e20f7..5337d36 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -21,16 +21,24 @@ import { disableStyle, enableStyle } from "@api/Styles";
@@ -21,10 +21,12 @@ import { disableStyle, enableStyle } from "@api/Styles";
import ErrorBoundary from "@components/ErrorBoundary";
import { ErrorCard } from "@components/ErrorCard";
import { Devs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
import { Margins } from "@utils/margins";
import definePlugin, { OptionType } from "@utils/types";
import { findByPropsLazy } from "@webpack";
import { findByPropsLazy, findLazy } from "@webpack";
-import { Forms, React } from "@webpack/common";
+import { Forms, React, UserStore } from "@webpack/common";
+import { User } from "discord-types/general";
import hideBugReport from "./hideBugReport.css?managed";
const KbdStyles = findByPropsLazy("key", "combo");
@@ -32,6 +34,12 @@ const KbdStyles = findByPropsLazy("key", "combo");
const BugReporterExperiment = findLazy(m => m?.definition?.id === "2024-09_bug_reporter");
const settings = definePluginSettings({
+ forceStagingBanner: {
@ -38,9 +39,9 @@ index 33c32b1..2992807 100644
toolbarDevMenu: {
type: OptionType.BOOLEAN,
description: "Change the Help (?) toolbar button (top right in chat) to Discord's developer menu",
@@ -91,6 +99,14 @@ export default definePlugin({
match: /\i\.isDM\(\)\|\|\i\.isThread\(\)/,
replace: "false",
@@ -100,6 +108,14 @@ export default definePlugin({
match: /\i\.isStaff\(\)/,
replace: "true"
}
+ },
+ {
@ -54,5 +55,5 @@ index 33c32b1..2992807 100644
],
--
2.46.0
2.46.1

@ -1,4 +1,4 @@
From 17bfc033158bdce9344f166864ca35b03699e341 Mon Sep 17 00:00:00 2001
From b093ee83a2038b3f7fd8fbed5d02e0089408551d Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Sat, 9 Mar 2024 08:00:55 +0000
Subject: [PATCH 4/8] Updater: don't prompt for updates when on a local branch
@ -26,5 +26,5 @@ index 1955f7d..0226565 100644
const commits = res.stdout.trim();
return commits ? commits.split("\n").map(line => {
--
2.46.0
2.46.1

@ -1,4 +1,4 @@
From 0582aecc1b49de2e34022b81f55f3092dcd08e34 Mon Sep 17 00:00:00 2001
From ebb54d88ead73a80d3874020a798ccdc21119563 Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Wed, 27 Dec 2023 15:05:44 +0000
Subject: [PATCH 5/8] Enable CSP bypass on stock discord desktop client
@ -25,5 +25,5 @@ index 5519d47..64e71c1 100644
let url = unsafeUrl.slice("vencord://".length);
if (url.endsWith("/")) url = url.slice(0, -1);
--
2.46.0
2.46.1

@ -1,4 +1,4 @@
From 9159ba3d4e133cda94df24fec231dd256d94c70c Mon Sep 17 00:00:00 2001
From 7e2d8a5d6a1a1b54d6f423469cae5c6d7841feb1 Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Sun, 21 Apr 2024 21:22:25 +0100
Subject: [PATCH 6/8] Updater: Disable auto-update by default
@ -21,5 +21,5 @@ index ac116f5..0f4c269 100644
useQuickCss: true,
themeLinks: [],
--
2.46.0
2.46.1

@ -1,4 +1,4 @@
From eaef08a2bec89ea80bb2e419c78968baaba1e7e8 Mon Sep 17 00:00:00 2001
From 7032f3b6764ccf0b616a58f63aebb5208c9ddcfe Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Sat, 20 Jul 2024 00:21:22 +0100
Subject: [PATCH 7/8] SupportHelper: Disable running arbitrary code snippets
@ -9,7 +9,7 @@ Why is this even a thing?
1 file changed, 22 deletions(-)
diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx
index de8e37c..7cb0044 100644
index 432896f..60461f3 100644
--- a/src/plugins/_core/supportHelper.tsx
+++ b/src/plugins/_core/supportHelper.tsx
@@ -300,28 +300,6 @@ export default definePlugin({
@ -42,5 +42,5 @@ index de8e37c..7cb0044 100644
return buttons.length
--
2.46.0
2.46.1

@ -1,4 +1,4 @@
From 7cad16368cf3fb25e41c76c139397db7aa90dd8f Mon Sep 17 00:00:00 2001
From 15830c1db71d6fb675711cbd6beb06c6d92cc224 Mon Sep 17 00:00:00 2001
From: 1024x2 <2pow11@gmail.com>
Date: Sat, 20 Jul 2024 00:04:36 +0100
Subject: [PATCH 8/8] =?UTF-8?q?ReplaceGoogleSearch:=20=E9=87=8D=E6=96=B0?=
@ -13,7 +13,7 @@ Content-Transfer-Encoding: 8bit
1 file changed, 1 insertion(+)
diff --git a/src/plugins/replaceGoogleSearch/index.tsx b/src/plugins/replaceGoogleSearch/index.tsx
index 43b0762..f7d3239 100644
index 593c986..2b0022d 100644
--- a/src/plugins/replaceGoogleSearch/index.tsx
+++ b/src/plugins/replaceGoogleSearch/index.tsx
@@ -17,6 +17,7 @@ const DefaultEngines = {
@ -25,5 +25,5 @@ index 43b0762..f7d3239 100644
Reddit: "https://www.reddit.com/search?q=",
Wikipedia: "https://wikipedia.org/w/index.php?search=",
--
2.46.0
2.46.1