From 81fbe676d788841cc8580815e2e2067759961fbe Mon Sep 17 00:00:00 2001 From: 1024x2 Date: Sat, 20 Jul 2024 15:21:28 +0100 Subject: Update patches --- 0001-Remove-donator-badges.patch | 14 +++---- 0002-Small-rebrand.patch | 22 +++++------ 0003-Experiments-Re-add-staging-banner.patch | 12 +++--- ...-t-prompt-for-updates-when-on-a-local-bra.patch | 4 +- ...SP-bypass-on-stock-discord-desktop-client.patch | 4 +- 0006-Updater-Disable-auto-update-by-default.patch | 6 +-- ...er-Disable-running-arbitrary-code-snippet.patch | 46 ++++++++++++++++++++++ ...GoogleSearch-99999999-Social-Credit-Score.patch | 24 +++++++++++ 8 files changed, 99 insertions(+), 33 deletions(-) create mode 100644 0007-SupportHelper-Disable-running-arbitrary-code-snippet.patch create mode 100644 0008-ReplaceGoogleSearch-99999999-Social-Credit-Score.patch diff --git a/0001-Remove-donator-badges.patch b/0001-Remove-donator-badges.patch index 795d546..35c3748 100644 --- a/0001-Remove-donator-badges.patch +++ b/0001-Remove-donator-badges.patch @@ -1,7 +1,7 @@ -From 396ec536cbdbf8bf2af1f22deee2553baf20d59f Mon Sep 17 00:00:00 2001 +From 13aa6fecd2481e4d9b589b70f9bf2cb062be85e1 Mon Sep 17 00:00:00 2001 From: 1024x2 <2pow11@gmail.com> Date: Wed, 24 Apr 2024 23:30:05 +0100 -Subject: [PATCH 1/6] Remove donator badges +Subject: [PATCH 1/8] 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. @@ -12,11 +12,11 @@ It's easiest to just get rid of the feature entirely. 2 files changed, 1 insertion(+), 97 deletions(-) diff --git a/src/api/Badges.ts b/src/api/Badges.ts -index 24c68c4e..4e1e9cff 100644 +index 7a041f1e..fefbd439 100644 --- a/src/api/Badges.ts +++ b/src/api/Badges.ts -@@ -78,8 +78,7 @@ export function _getBadges(args: BadgeUserArgs) { - : badges.push({ ...badge, ...args }); +@@ -90,8 +90,7 @@ export function _getBadges(args: BadgeUserArgs) { + : badges.push(...b); } } - const donorBadges = (Plugins.BadgeAPI as unknown as typeof import("../plugins/_api/badges").default).getDonorBadges(args.userId); @@ -26,7 +26,7 @@ index 24c68c4e..4e1e9cff 100644 return badges; } diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx -index d8e391ae..f31af4c6 100644 +index 89a992ac..642769c8 100644 --- a/src/plugins/_api/badges/index.tsx +++ b/src/plugins/_api/badges/index.tsx @@ -43,19 +43,6 @@ const ContributorBadge: ProfileBadge = { @@ -70,7 +70,7 @@ index d8e391ae..f31af4c6 100644 }, getBadges(props: { userId: string; user?: User; guildId: string; }) { -@@ -150,74 +125,4 @@ export default definePlugin({ +@@ -152,74 +127,4 @@ export default definePlugin({ const Component = badge.component!; return ; }, { noop: true }), diff --git a/0002-Small-rebrand.patch b/0002-Small-rebrand.patch index fc48434..8299394 100644 --- a/0002-Small-rebrand.patch +++ b/0002-Small-rebrand.patch @@ -1,17 +1,17 @@ -From ef93612c35d84586aabab79695ca80a3e1a033ef Mon Sep 17 00:00:00 2001 +From 7f2616afaa482258adbe9535207ce04a1ff7bb8b Mon Sep 17 00:00:00 2001 From: 1024x2 <2pow11@gmail.com> Date: Sat, 8 Jun 2024 22:58:09 +0100 -Subject: [PATCH 2/6] Small rebrand +Subject: [PATCH 2/8] Small rebrand There's a litevex in here! It's got my gun!!! AHHHHHHHH --- - README.md | 51 ++++++++----------- + README.md | 48 ++++++++----------- src/components/VencordSettings/VencordTab.tsx | 4 +- src/plugins/vencordToolbox/index.tsx | 10 ++-- - 3 files changed, 27 insertions(+), 38 deletions(-) + 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md -index e67db93a..995af92d 100644 +index 61575d4b..995af92d 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,21 @@ @@ -42,7 +42,7 @@ index e67db93a..995af92d 100644 - Works on any Discord branch: Stable, Canary or PTB all work (though for the best experience I recommend stable!) - Custom CSS and Themes: Inbuilt css editor with support to import any css files (including BetterDiscord themes) - Privacy friendly, blocks Discord analytics & crash reporting out of the box and has no telemetry -@@ -22,51 +23,39 @@ The cutest Discord client mod +@@ -22,46 +23,39 @@ The cutest Discord client mod - Settings sync: Keep your plugins and their settings synchronised between devices / apps (optional) @@ -101,17 +101,13 @@ index e67db93a..995af92d 100644 +However, I do not care. - --```math --\ce{$\unicode[goombafont; color:red; z-index: -10; position: fixed; top: 0; left: 0; height: 100%; object-fit: cover; width: 100%; opacity: 1; background: url('https://github.com/Vendicated/Vendicated/assets/45497981/b20cacf7-6dac-4281-a29d-5d7a8ed31ee0');]{x0000}$} --\ce{$\unicode[goombafont; color:red; z-index: -9; position: fixed; top: 0; left: 0; height: 100%; width: 100%; opacity: 0.9; background: var(--bgColor-default);]{x0000}$} --``` ++ +big big chungus big chungus big chungus diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx -index c0a66fdc..a975a53a 100644 +index 97f82e77..675682e8 100644 --- a/src/components/VencordSettings/VencordTab.tsx +++ b/src/components/VencordSettings/VencordTab.tsx -@@ -31,8 +31,8 @@ import { SettingsTab, wrapTab } from "./shared"; +@@ -35,8 +35,8 @@ import { SettingsTab, wrapTab } from "./shared"; const cl = classNameFactory("vc-settings-"); diff --git a/0003-Experiments-Re-add-staging-banner.patch b/0003-Experiments-Re-add-staging-banner.patch index d3afa8d..7294be6 100644 --- a/0003-Experiments-Re-add-staging-banner.patch +++ b/0003-Experiments-Re-add-staging-banner.patch @@ -1,7 +1,7 @@ -From 1460d956d90877547bb1a9164ccad58f43c984bb Mon Sep 17 00:00:00 2001 +From 728c86eb4d6f3d2c96c1a354a947436dd64d4c8a Mon Sep 17 00:00:00 2001 From: 1024x2 <2pow11@gmail.com> Date: Thu, 13 Jun 2024 01:00:35 +0100 -Subject: [PATCH 3/6] Experiments: Re-add staging banner +Subject: [PATCH 3/8] Experiments: Re-add staging banner (it's funny) --- @@ -9,7 +9,7 @@ Subject: [PATCH 3/6] 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 9cb22521..6374c8ac 100644 +index 33c32b1a..2992807e 100644 --- a/src/plugins/experiments/index.tsx +++ b/src/plugins/experiments/index.tsx @@ -21,16 +21,24 @@ import { disableStyle, enableStyle } from "@api/Styles"; @@ -26,7 +26,7 @@ index 9cb22521..6374c8ac 100644 import hideBugReport from "./hideBugReport.css?managed"; - const KbdStyles = findByPropsLazy("key", "removeBuildOverride"); + const KbdStyles = findByPropsLazy("key", "combo"); const settings = definePluginSettings({ + forceStagingBanner: { @@ -39,8 +39,8 @@ index 9cb22521..6374c8ac 100644 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: "true", + match: /\i\.isDM\(\)\|\|\i\.isThread\(\)/, + replace: "false", } + }, + { 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 58338bf..946e723 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 9d07ec222bebf8957da4888f935671a11ff8d633 Mon Sep 17 00:00:00 2001 +From f4765b5c9993bdf05527a8ad82b626be0e9aa12e Mon Sep 17 00:00:00 2001 From: 1024x2 <2pow11@gmail.com> Date: Sat, 9 Mar 2024 08:00:55 +0000 -Subject: [PATCH 4/6] Updater: don't prompt for updates when on a local branch +Subject: [PATCH 4/8] Updater: don't prompt for updates when on a local branch --- src/main/updater/git.ts | 7 +------ 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 fb48094..c80228b 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 7624067dbd0795b4bf87f7786226a60f1d7b06e6 Mon Sep 17 00:00:00 2001 +From c53d0c88c89d73d7e5ef0fac3f2eff6adeb7df0c Mon Sep 17 00:00:00 2001 From: 1024x2 <2pow11@gmail.com> Date: Wed, 27 Dec 2023 15:05:44 +0000 -Subject: [PATCH 5/6] Enable CSP bypass on stock discord desktop client +Subject: [PATCH 5/8] Enable CSP bypass on stock discord desktop client --- src/main/index.ts | 3 ++- diff --git a/0006-Updater-Disable-auto-update-by-default.patch b/0006-Updater-Disable-auto-update-by-default.patch index 873d17b..1063aa1 100644 --- a/0006-Updater-Disable-auto-update-by-default.patch +++ b/0006-Updater-Disable-auto-update-by-default.patch @@ -1,14 +1,14 @@ -From 9504b94a562aea236704b522005e68aa4d8afee4 Mon Sep 17 00:00:00 2001 +From 7fa2978a594299da8afb583cfaea6512838f7e6f Mon Sep 17 00:00:00 2001 From: 1024x2 <2pow11@gmail.com> Date: Sun, 21 Apr 2024 21:22:25 +0100 -Subject: [PATCH 6/6] Updater: Disable auto-update by default +Subject: [PATCH 6/8] Updater: Disable auto-update by default --- src/api/Settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/Settings.ts b/src/api/Settings.ts -index 70ba0bd4..2632c43f 100644 +index 88337a91..4473bc1c 100644 --- a/src/api/Settings.ts +++ b/src/api/Settings.ts @@ -77,7 +77,7 @@ export interface Settings { diff --git a/0007-SupportHelper-Disable-running-arbitrary-code-snippet.patch b/0007-SupportHelper-Disable-running-arbitrary-code-snippet.patch new file mode 100644 index 0000000..e2d28a7 --- /dev/null +++ b/0007-SupportHelper-Disable-running-arbitrary-code-snippet.patch @@ -0,0 +1,46 @@ +From 5dc5bfcf6b8cc2f12be7cbfcc770a759217c6d11 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 + +Why is this even a thing? +--- + src/plugins/_core/supportHelper.tsx | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx +index de8e37c7..7cb0044d 100644 +--- a/src/plugins/_core/supportHelper.tsx ++++ b/src/plugins/_core/supportHelper.tsx +@@ -300,28 +300,6 @@ export default definePlugin({ + + ); + } +- +- if (props.message.author.id === VENBOT_USER_ID) { +- const match = CodeBlockRe.exec(props.message.content || props.message.embeds[0]?.rawDescription || ""); +- if (match) { +- buttons.push( +- +- ); +- } +- } + } + + return buttons.length +-- +2.45.2 + diff --git a/0008-ReplaceGoogleSearch-99999999-Social-Credit-Score.patch b/0008-ReplaceGoogleSearch-99999999-Social-Credit-Score.patch new file mode 100644 index 0000000..773d36b --- /dev/null +++ b/0008-ReplaceGoogleSearch-99999999-Social-Credit-Score.patch @@ -0,0 +1,24 @@ +From af07da50b0913f53f70b636f06f853c90cfdd9a6 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] ReplaceGoogleSearch: +99999999 Social Credit Score + +--- + src/plugins/replaceGoogleSearch/index.tsx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/replaceGoogleSearch/index.tsx b/src/plugins/replaceGoogleSearch/index.tsx +index 43b0762a..f7d32397 100644 +--- a/src/plugins/replaceGoogleSearch/index.tsx ++++ b/src/plugins/replaceGoogleSearch/index.tsx +@@ -17,6 +17,7 @@ const DefaultEngines = { + Bing: "https://www.bing.com/search?q=", + Yahoo: "https://search.yahoo.com/search?p=", + Yandex: "https://yandex.com/search/?text=", ++ Baidu: "https://www.baidu.com/s?wd=", + GitHub: "https://github.com/search?q=", + Reddit: "https://www.reddit.com/search?q=", + Wikipedia: "https://wikipedia.org/w/index.php?search=", +-- +2.45.2 + -- cgit v1.2.3