mirror of
https://git.1024x2.xyz/1024x2/vexcord.git
synced 2025-10-31 10:04:31 +01:00
Update patches
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 6f4d3bbe8c52828bdabd4e780b111b99fcba8959 Mon Sep 17 00:00:00 2001
|
||||
From 920bd4bdc31332279ab2458182871de8991dcfb4 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
|
||||
@@ -12,25 +12,25 @@ 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 061bdeb..bc9e887 100644
|
||||
index 24c68c4e..4e1e9cff 100644
|
||||
--- a/src/api/Badges.ts
|
||||
+++ b/src/api/Badges.ts
|
||||
@@ -79,8 +79,7 @@ export function _getBadges(args: BadgeUserArgs) {
|
||||
@@ -78,8 +78,7 @@ export function _getBadges(args: BadgeUserArgs) {
|
||||
: badges.push({ ...badge, ...args });
|
||||
}
|
||||
}
|
||||
- const donorBadges = (Plugins.BadgeAPI as unknown as typeof import("../plugins/_api/badges").default).getDonorBadges(args.user.id);
|
||||
- const donorBadges = (Plugins.BadgeAPI as unknown as typeof import("../plugins/_api/badges").default).getDonorBadges(args.userId);
|
||||
- if (donorBadges) badges.unshift(...donorBadges);
|
||||
+ void Plugins.BadgeAPI; // If I don't reference this everything breaks???
|
||||
|
||||
return badges;
|
||||
}
|
||||
diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx
|
||||
index bbccf0a..7bbe430 100644
|
||||
index b4ee45a1..9549f03e 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)
|
||||
@@ -43,19 +43,6 @@ const ContributorBadge: ProfileBadge = {
|
||||
onClick: (_, { userId }) => openContributorModal(UserStore.getUser(userId))
|
||||
};
|
||||
|
||||
-let DonorBadges = {} as Record<string, Array<Record<"tooltip" | "badge", string>>>;
|
||||
@@ -49,7 +49,7 @@ index bbccf0a..7bbe430 100644
|
||||
export default definePlugin({
|
||||
name: "BadgeAPI",
|
||||
description: "API to add badges to users.",
|
||||
@@ -88,94 +75,12 @@ export default definePlugin({
|
||||
@@ -123,20 +110,8 @@ export default definePlugin({
|
||||
}
|
||||
],
|
||||
|
||||
@@ -69,7 +69,8 @@ index bbccf0a..7bbe430 100644
|
||||
- await loadBadges();
|
||||
},
|
||||
|
||||
renderBadgeComponent: ErrorBoundary.wrap((badge: ProfileBadge & BadgeUserArgs) => {
|
||||
getBadges(props: { userId: string; user?: User; guildId: string; }) {
|
||||
@@ -154,74 +129,4 @@ export default definePlugin({
|
||||
const Component = badge.component!;
|
||||
return <Component {...badge} />;
|
||||
}, { noop: true }),
|
||||
@@ -145,5 +146,5 @@ index bbccf0a..7bbe430 100644
|
||||
- }
|
||||
});
|
||||
--
|
||||
2.45.0
|
||||
2.45.2
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
From 3a26a9789a6766f936ee3fa42ec1114237349ba1 Mon Sep 17 00:00:00 2001
|
||||
From 0e652d9aadfb803a6d42db3c8d7ce1eb5eddec63 Mon Sep 17 00:00:00 2001
|
||||
From: 1024x2 <2pow11@gmail.com>
|
||||
Date: Sat, 9 Mar 2024 07:57:26 +0000
|
||||
Date: Sat, 8 Jun 2024 22:58:09 +0100
|
||||
Subject: [PATCH 2/6] Small rebrand
|
||||
|
||||
There's a litevex in here! It's got my gun!!! AHHHHHHHH
|
||||
---
|
||||
README.md | 46 ++++++++-----------
|
||||
README.md | 51 ++++++++-----------
|
||||
src/components/VencordSettings/VencordTab.tsx | 4 +-
|
||||
src/plugins/vencordToolbox/index.tsx | 10 ++--
|
||||
3 files changed, 26 insertions(+), 34 deletions(-)
|
||||
3 files changed, 27 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/README.md b/README.md
|
||||
index a43c9f8..1f4f970 100644
|
||||
index e67db93a..995af92d 100644
|
||||
--- a/README.md
|
||||
+++ b/README.md
|
||||
@@ -1,20 +1,21 @@
|
||||
@@ -25,9 +25,9 @@ index a43c9f8..1f4f970 100644
|
||||
|
||||
-|  |
|
||||
+|  |
|
||||
|:--:|
|
||||
-| A screenshot of vencord showcasing the [vencord-theme](https://github.com/synqat/vencord-theme) |
|
||||
+| A screenshot of vexcord showcasing the [pornliker](https://litevex.staropa.net/) |
|
||||
| :--------------------------------------------------------------------------------------------------: |
|
||||
-| A screenshot of vencord showcasing the [vencord-theme](https://github.com/synqat/vencord-theme) |
|
||||
+| A screenshot of vexcord showcasing the [pornliker](https://litevex.staropa.net/) |
|
||||
|
||||
## Features
|
||||
|
||||
@@ -42,7 +42,7 @@ index a43c9f8..1f4f970 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,46 +23,37 @@ The cutest Discord client mod
|
||||
@@ -22,51 +23,39 @@ The cutest Discord client mod
|
||||
- Settings sync: Keep your plugins and their settings synchronised between devices / apps (optional)
|
||||
|
||||
|
||||
@@ -63,9 +63,9 @@ index a43c9f8..1f4f970 100644
|
||||
|
||||
## Sponsors
|
||||
|
||||
-| **Thanks a lot to all Vencord [sponsors](https://github.com/sponsors/Vendicated)!!** |
|
||||
-|:--:|
|
||||
-| [](https://github.com/sponsors/Vendicated) |
|
||||
-| **Thanks a lot to all Vencord [sponsors](https://github.com/sponsors/Vendicated)!!** |
|
||||
-| :------------------------------------------------------------------------------------------: |
|
||||
-| [](https://github.com/sponsors/Vendicated) |
|
||||
-| *generated using [github-sponsor-graph](https://github.com/Vendicated/github-sponsor-graph)* |
|
||||
-
|
||||
+WHY WOULD YOU PAY MONEY FOR THIS??
|
||||
@@ -101,8 +101,14 @@ index a43c9f8..1f4f970 100644
|
||||
+However, I do not care.
|
||||
|
||||
</details>
|
||||
|
||||
-```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 c0a66fd..a975a53 100644
|
||||
index c0a66fdc..a975a53a 100644
|
||||
--- a/src/components/VencordSettings/VencordTab.tsx
|
||||
+++ b/src/components/VencordSettings/VencordTab.tsx
|
||||
@@ -31,8 +31,8 @@ import { SettingsTab, wrapTab } from "./shared";
|
||||
@@ -117,7 +123,7 @@ index c0a66fd..a975a53 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 00805fb..7d935f4 100644
|
||||
index 00805fbd..7d935f4a 100644
|
||||
--- a/src/plugins/vencordToolbox/index.tsx
|
||||
+++ b/src/plugins/vencordToolbox/index.tsx
|
||||
@@ -86,10 +86,10 @@ function VencordPopout(onClose: () => void) {
|
||||
@@ -146,5 +152,5 @@ index 00805fb..7d935f4 100644
|
||||
/>
|
||||
)}
|
||||
--
|
||||
2.45.0
|
||||
2.45.2
|
||||
|
||||
|
||||
109
0003-Experiments-Re-add-isStaff-and-staging-banner.patch
Normal file
109
0003-Experiments-Re-add-isStaff-and-staging-banner.patch
Normal file
@@ -0,0 +1,109 @@
|
||||
From 3b8d2305b7f49f24b2b82d3bff35ce5aebbcc7fb Mon Sep 17 00:00:00 2001
|
||||
From: 1024x2 <2pow11@gmail.com>
|
||||
Date: Sat, 8 Jun 2024 23:11:43 +0100
|
||||
Subject: [PATCH 3/6] Experiments: Re-add isStaff and staging banner
|
||||
|
||||
(it's funny)
|
||||
---
|
||||
src/plugins/experiments/index.tsx | 54 +++++++++++++++++++++++++++++--
|
||||
1 file changed, 52 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
|
||||
index cf4dbf24..5a01ffad 100644
|
||||
--- a/src/plugins/experiments/index.tsx
|
||||
+++ b/src/plugins/experiments/index.tsx
|
||||
@@ -16,19 +16,37 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
+import { definePluginSettings } from "@api/Settings";
|
||||
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 from "@utils/types";
|
||||
+import definePlugin, { OptionType } from "@utils/types";
|
||||
import { findByPropsLazy } 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", "removeBuildOverride");
|
||||
|
||||
+const settings = definePluginSettings({
|
||||
+ enableIsStaff: {
|
||||
+ description: "Enable isStaff",
|
||||
+ type: OptionType.BOOLEAN,
|
||||
+ default: false,
|
||||
+ restartNeeded: true
|
||||
+ },
|
||||
+ forceStagingBanner: {
|
||||
+ description: "Whether to force Staging banner under user area.",
|
||||
+ type: OptionType.BOOLEAN,
|
||||
+ default: false,
|
||||
+ restartNeeded: true
|
||||
+ }
|
||||
+});
|
||||
+
|
||||
export default definePlugin({
|
||||
name: "Experiments",
|
||||
description: "Enable Access to Experiments & other dev-only features in Discord!",
|
||||
@@ -39,6 +57,7 @@ export default definePlugin({
|
||||
Devs.BanTheNons,
|
||||
Devs.Nuckyz
|
||||
],
|
||||
+ settings,
|
||||
|
||||
patches: [
|
||||
{
|
||||
@@ -69,12 +88,43 @@ export default definePlugin({
|
||||
match: /\i\.isStaff\(\)/,
|
||||
replace: "true"
|
||||
}
|
||||
+ },
|
||||
+ {
|
||||
+ find: '"isStaff",',
|
||||
+ predicate: () => settings.store.enableIsStaff,
|
||||
+ replacement: [
|
||||
+ {
|
||||
+ match: /(?<=>)(\i)\.hasFlag\((\i\.\i)\.STAFF\)(?=})/,
|
||||
+ replace: (_, user, flags) => `$self.isStaff(${user},${flags})`
|
||||
+ },
|
||||
+ {
|
||||
+ match: /hasFreePremium\(\){return this.isStaff\(\)\s*?\|\|/,
|
||||
+ replace: "hasFreePremium(){return ",
|
||||
+ }
|
||||
+ ]
|
||||
+ },
|
||||
+ {
|
||||
+ find: ".Messages.DEV_NOTICE_STAGING",
|
||||
+ predicate: () => settings.store.forceStagingBanner,
|
||||
+ replacement: {
|
||||
+ match: /window\.GLOBAL_ENV\.RELEASE_CHANNEL/,
|
||||
+ replace: "\"staging\""
|
||||
+ }
|
||||
}
|
||||
],
|
||||
|
||||
start: () => enableStyle(hideBugReport),
|
||||
stop: () => disableStyle(hideBugReport),
|
||||
|
||||
+ isStaff(user: User, flags: any) {
|
||||
+ try {
|
||||
+ return UserStore.getCurrentUser()?.id === user.id || user.hasFlag(flags.STAFF);
|
||||
+ } catch (err) {
|
||||
+ new Logger("Experiments").error(err);
|
||||
+ return user.hasFlag(flags.STAFF);
|
||||
+ }
|
||||
+ },
|
||||
+
|
||||
settingsAboutComponent: () => {
|
||||
const isMacOS = navigator.platform.includes("Mac");
|
||||
const modKey = isMacOS ? "cmd" : "ctrl";
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
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/6] Experiments: Re-add staging banner
|
||||
|
||||
(it's funny)
|
||||
---
|
||||
src/plugins/experiments/index.tsx | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
|
||||
index 50b9521..4d7a9ca 100644
|
||||
--- a/src/plugins/experiments/index.tsx
|
||||
+++ b/src/plugins/experiments/index.tsx
|
||||
@@ -35,6 +35,12 @@ const settings = definePluginSettings({
|
||||
type: OptionType.BOOLEAN,
|
||||
default: false,
|
||||
restartNeeded: true
|
||||
+ },
|
||||
+ forceStagingBanner: {
|
||||
+ description: "Whether to force Staging banner under user area.",
|
||||
+ type: OptionType.BOOLEAN,
|
||||
+ default: false,
|
||||
+ restartNeeded: true
|
||||
}
|
||||
});
|
||||
|
||||
@@ -79,6 +85,14 @@ export default definePlugin({
|
||||
}
|
||||
]
|
||||
},
|
||||
+ {
|
||||
+ find: ".Messages.DEV_NOTICE_STAGING",
|
||||
+ predicate: () => settings.store.forceStagingBanner,
|
||||
+ replacement: {
|
||||
+ match: /window\.GLOBAL_ENV\.RELEASE_CHANNEL/,
|
||||
+ replace: "\"staging\""
|
||||
+ }
|
||||
+ },
|
||||
{
|
||||
find: 'H1,title:"Experiments"',
|
||||
replacement: {
|
||||
--
|
||||
2.45.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b7338cfdaab929af2dad6d202a237ed824ad58b2 Mon Sep 17 00:00:00 2001
|
||||
From 6c84f6b51db8fa01326dace1cb6634fc1305f6c7 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
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH 4/6] 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 1955f7d..0226565 100644
|
||||
index 1955f7dc..0226565e 100644
|
||||
--- a/src/main/updater/git.ts
|
||||
+++ b/src/main/updater/git.ts
|
||||
@@ -49,12 +49,7 @@ async function getRepo() {
|
||||
@@ -26,5 +26,5 @@ index 1955f7d..0226565 100644
|
||||
const commits = res.stdout.trim();
|
||||
return commits ? commits.split("\n").map(line => {
|
||||
--
|
||||
2.45.0
|
||||
2.45.2
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d9eee32aebb1f153598c53106cac09625b3515c2 Mon Sep 17 00:00:00 2001
|
||||
From d9490ae87fc2ef6f8bba2426c3b05e44e0ea78df 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
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH 5/6] Enable CSP bypass on stock discord desktop client
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/index.ts b/src/main/index.ts
|
||||
index 5519d47..64e71c1 100644
|
||||
index 5519d47a..64e71c15 100644
|
||||
--- a/src/main/index.ts
|
||||
+++ b/src/main/index.ts
|
||||
@@ -24,10 +24,11 @@ import { RendererSettings } from "./settings";
|
||||
@@ -25,5 +25,5 @@ index 5519d47..64e71c1 100644
|
||||
let url = unsafeUrl.slice("vencord://".length);
|
||||
if (url.endsWith("/")) url = url.slice(0, -1);
|
||||
--
|
||||
2.45.0
|
||||
2.45.2
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From cdbd25f4d76bf0a7fbf57c26b3ce14cd8f90f5f4 Mon Sep 17 00:00:00 2001
|
||||
From eb88bbf9bf7fa46ed4940e7d4aa59c7885252211 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
|
||||
@@ -8,7 +8,7 @@ Subject: [PATCH 6/6] Updater: Disable auto-update by default
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/api/Settings.ts b/src/api/Settings.ts
|
||||
index 696c12c..4503011 100644
|
||||
index 70ba0bd4..2632c43f 100644
|
||||
--- a/src/api/Settings.ts
|
||||
+++ b/src/api/Settings.ts
|
||||
@@ -77,7 +77,7 @@ export interface Settings {
|
||||
@@ -21,5 +21,5 @@ index 696c12c..4503011 100644
|
||||
useQuickCss: true,
|
||||
themeLinks: [],
|
||||
--
|
||||
2.45.0
|
||||
2.45.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user