Date: Thu, 29 May 2025 23:10:53 +0200
Subject: [PATCH 04/10] WhoReacted: fix crashing (app reloading)
---
src/plugins/whoReacted/index.tsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index aea57fef..f14de9f5 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -66,7 +66,7 @@ function fetchReactions(msg: Message, emoji: ReactionEmoji, type: number) {
function getReactionsWithQueue(msg: Message, e: ReactionEmoji, type: number) {
const key = `${msg.id}:${e.name}:${e.id ?? ""}:${type}`;
- const cache = reactions[key] ??= { fetched: false, users: {} };
+ const cache = reactions[key] ??= { fetched: false, users: new Map() };
if (!cache.fetched) {
queue.unshift(() => fetchReactions(msg, e, type));
cache.fetched = true;
@@ -159,7 +159,7 @@ export default definePlugin({
}, [message.id, forceUpdate]);
const reactions = getReactionsWithQueue(message, emoji, type);
- const users = Object.values(reactions).filter(Boolean) as User[];
+ const users = [...reactions.values()].filter(Boolean);
return (
;
+ users: Map;
}
interface RootObject {
From f0fcaf734e7c11bd2fd02ff6efd95fcd7191d8ce Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 30 May 2025 11:49:32 -0300
Subject: [PATCH 05/10] ShowHiddenChannels: Fix erroring when avoiding fetching
channel messages
---
src/plugins/showHiddenChannels/index.tsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 5dad87c5..aed6066d 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -494,10 +494,10 @@ export default definePlugin({
isHiddenChannel(channel: Channel & { channelId?: string; }, checkConnect = false) {
try {
- if (!channel) return false;
+ if (channel == null || Object.hasOwn(channel, "channelId") && channel.channelId == null) return false;
- if (channel.channelId) channel = ChannelStore.getChannel(channel.channelId);
- if (!channel || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return false;
+ if (channel.channelId != null) channel = ChannelStore.getChannel(channel.channelId);
+ if (channel == null || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return false;
return !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || checkConnect && !PermissionStore.can(PermissionsBits.CONNECT, channel);
} catch (e) {
From 0e90bda3c73dd5a568c4e14b8e922b0657ad43ba Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 4 Jun 2025 20:53:43 -0300
Subject: [PATCH 06/10] Fix AnonymiseFileNames
Also fix issues with User Profile Modal v2 MutualGroupDMs patches
---
src/plugins/anonymiseFileNames/index.tsx | 23 +++++++++++------------
src/plugins/mutualGroupDMs/index.tsx | 9 ++-------
src/plugins/mutualGroupDMs/style.css | 2 +-
3 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
index 34b5a5fa..d24de222 100644
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -72,18 +72,17 @@ export default definePlugin({
patches: [
{
- find: 'type:"UPLOAD_START"',
- replacement: {
- match: /await \i\.uploadFiles\((\i),/,
- replace: "$1.forEach($self.anonymise),$&"
- },
- },
- {
- find: 'addFilesTo:"message.attachments"',
- replacement: {
- match: /\i.uploadFiles\((\i),/,
- replace: "$1.forEach($self.anonymise),$&"
- }
+ find: "async uploadFiles(",
+ replacement: [
+ {
+ match: /async uploadFiles\((\i),\i\){/,
+ replace: "$&$1.forEach($self.anonymise);"
+ },
+ {
+ match: /async uploadFilesSimple\((\i)\){/,
+ replace: "$&$1.forEach($self.anonymise);"
+ }
+ ],
},
{
find: "#{intl::ATTACHMENT_UTILITIES_SPOILER}",
diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index e46824b4..1058410f 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -121,14 +121,9 @@ export default definePlugin({
},
// Make the gap between each item smaller so our tab can fit.
{
- match: /className:\i\.tabBar/,
- replace: '$& + " vc-mutual-gdms-modal-v2-tab-bar"'
+ match: /type:"top",/,
+ replace: '$&className:"vc-mutual-gdms-modal-v2-tab-bar",'
},
- // Make the tab bar item text smaller so our tab can fit.
- {
- match: /(\.tabBarItem.+?variant:)"heading-md\/normal"/,
- replace: '$1"heading-sm/normal"'
- }
]
},
{
diff --git a/src/plugins/mutualGroupDMs/style.css b/src/plugins/mutualGroupDMs/style.css
index f0ad3c60..b6d992ad 100644
--- a/src/plugins/mutualGroupDMs/style.css
+++ b/src/plugins/mutualGroupDMs/style.css
@@ -3,5 +3,5 @@
}
.vc-mutual-gdms-modal-v2-tab-bar {
- gap: 12px;
+ --space-xl: 16px;
}
From db0bcf7da39102c3502eb9a206eab55a2fbffa02 Mon Sep 17 00:00:00 2001
From: Elvyra <88881326+EepyElvyra@users.noreply.github.com>
Date: Thu, 5 Jun 2025 02:18:20 +0200
Subject: [PATCH 07/10] WebContextMenus: Fix copying and saving images (#3459)
---
src/plugins/webContextMenus.web/index.ts | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index 45e6fa00..666e51be 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -122,10 +122,16 @@ export default definePlugin({
{
find: "Copy image not supported",
- replacement: {
- match: /(?<=(?:canSaveImage|canCopyImage)\(\i?\)\{.{0,50})!\i\.isPlatformEmbedded/g,
- replace: "false"
- }
+ replacement: [
+ {
+ match: /(?<=(?:canSaveImage|canCopyImage)\(.{0,120}?)!\i\.isPlatformEmbedded/g,
+ replace: "false"
+ },
+ {
+ match: /canCopyImage\(.+?(?=return"function"==typeof \i\.clipboard\.copyImage)/,
+ replace: "$&return true;"
+ }
+ ]
},
// Add back Copy & Save Image
{
@@ -137,7 +143,7 @@ export default definePlugin({
replace: "false"
},
{
- match: /return\s*?\[.{0,50}?(?=\?.{0,100}?id:"copy-image")/,
+ match: /return\s*?\[.{0,50}?(?=\?\(0,\i\.jsxs?.{0,100}?id:"copy-image")/,
replace: "return [true"
},
{
From 503c90c201e9aeca9db622bde8fa9366edfd2a0d Mon Sep 17 00:00:00 2001
From: Henry
Date: Wed, 4 Jun 2025 19:24:04 -0500
Subject: [PATCH 08/10] ShowHiddenChannels: Fix showing lock icon for special
channels (#3460)
---
src/plugins/showHiddenChannels/index.tsx | 1 +
src/utils/constants.ts | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index aed6066d..149d422b 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -498,6 +498,7 @@ export default definePlugin({
if (channel.channelId != null) channel = ChannelStore.getChannel(channel.channelId);
if (channel == null || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return false;
+ if (["browse", "customize", "guide"].includes(channel.id)) return false;
return !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || checkConnect && !PermissionStore.can(PermissionsBits.CONNECT, channel);
} catch (e) {
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 65c73bd8..7bcadb42 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -589,6 +589,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
name: "samsam",
id: 836452332387565589n,
},
+ Cootshk: {
+ name: "Cootshk",
+ id: 921605971577548820n
+ },
} satisfies Record);
// iife so #__PURE__ works correctly
From 0ce7772500f97bba6c7a9954901401b8c3bb879a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 5 Jun 2025 15:42:00 -0300
Subject: [PATCH 09/10] FakeNitro: Fix sending animated stickers
---
src/webpack/common/utils.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 05eb5729..5c54c95a 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -138,7 +138,7 @@ export const UserUtils = {
export const UploadManager = findByPropsLazy("clearAll", "addFile");
export const UploadHandler = {
- promptToUpload: findByCodeLazy("#{intl::ATTACHMENT_TOO_MANY_ERROR_TITLE}") as (files: File[], channel: Channel, draftType: Number) => void
+ promptToUpload: findByCodeLazy("=!0,showLargeMessageDialog:") as (files: File[], channel: Channel, draftType: Number) => void
};
export const ApplicationAssetUtils = mapMangledModuleLazy("getAssetImage: size must === [", {
From 77084203c6ff51d1a484bb22ba57cf7017d647ad Mon Sep 17 00:00:00 2001
From: dorkbutt
Date: Fri, 6 Jun 2025 12:20:47 -0400
Subject: [PATCH 10/10] fork init
---
src/plugins/other-usrbg/index.tsx | 120 +++++++++++++++++++++++++++++
src/plugins/other-usrbg/users.json | 6 ++
2 files changed, 126 insertions(+)
create mode 100644 src/plugins/other-usrbg/index.tsx
create mode 100644 src/plugins/other-usrbg/users.json
diff --git a/src/plugins/other-usrbg/index.tsx b/src/plugins/other-usrbg/index.tsx
new file mode 100644
index 00000000..d77e8780
--- /dev/null
+++ b/src/plugins/other-usrbg/index.tsx
@@ -0,0 +1,120 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+*/
+
+import { definePluginSettings } from "@api/Settings";
+import { Link } from "@components/Link";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+const API_URL = "https://usrbg.dorkbutt.lol/users/users.json";
+
+interface UsrbgApiReturn {
+ endpoint: string;
+ bucket: string;
+ prefix: string;
+ users: Record;
+}
+
+const settings = definePluginSettings({
+ nitroFirst: {
+ description: "Banner to use if both Nitro and USRBG banners are present",
+ type: OptionType.SELECT,
+ options: [
+ { label: "Nitro banner", value: true, default: true },
+ { label: "USRBG banner", value: false },
+ ]
+ },
+ voiceBackground: {
+ description: "Use USRBG banners as voice chat backgrounds",
+ type: OptionType.BOOLEAN,
+ default: true,
+ restartNeeded: true
+ }
+});
+
+export default definePlugin({
+ name: "FORKED - USRBG",
+ description: "Displays user banners from dorkbutt's USRBG server, allowing anyone to get a banner without Nitro",
+ authors: [Devs.dorkbutt, Devs.AutumnVN, Devs.katlyn, Devs.pylix, Devs.TheKodeToad],
+ settings,
+ patches: [
+ {
+ find: '.banner)==null?"COMPLETE"',
+ replacement: {
+ match: /(?<=void 0:)\i.getPreviewBanner\(\i,\i,\i\)/,
+ replace: "$self.patchBannerUrl(arguments[0])||$&"
+
+ }
+ },
+ {
+ find: "\"data-selenium-video-tile\":",
+ predicate: () => settings.store.voiceBackground,
+ replacement: [
+ {
+ match: /(?<=function\((\i),\i\)\{)(?=let.{20,40},style:)/,
+ replace: "$1.style=$self.getVoiceBackgroundStyles($1);"
+ }
+ ]
+ }
+ ],
+
+ data: null as UsrbgApiReturn | null,
+
+ settingsAboutComponent: () => {
+ return (
+ "Message @dorkbutt about getting your personal banner added!"
+ );
+ },
+
+ getVoiceBackgroundStyles({ className, participantUserId }: any) {
+ if (className.includes("tile_")) {
+ if (this.userHasBackground(participantUserId)) {
+ return {
+ backgroundImage: `url(${this.getImageUrl(participantUserId)})`,
+ backgroundSize: "cover",
+ backgroundPosition: "center",
+ backgroundRepeat: "no-repeat"
+ };
+ }
+ }
+ },
+
+ patchBannerUrl({ displayProfile }: any) {
+ if (displayProfile?.banner && settings.store.nitroFirst) return;
+ if (this.userHasBackground(displayProfile?.userId)) return this.getImageUrl(displayProfile?.userId);
+ },
+
+ userHasBackground(userId: string) {
+ return !!this.data?.users[userId];
+ },
+
+ getImageUrl(userId: string): string | null {
+ if (!this.userHasBackground(userId)) return null;
+
+ // We can assert that data exists because userHasBackground returned true
+ const { endpoint, bucket, prefix, users: { [userId]: etag } } = this.data!;
+ return `${endpoint}/${bucket}/${prefix}${userId}?${etag}`;
+ },
+
+ async start() {
+ const res = await fetch(API_URL);
+ if (res.ok) {
+ this.data = await res.json();
+ }
+ }
+});
diff --git a/src/plugins/other-usrbg/users.json b/src/plugins/other-usrbg/users.json
new file mode 100644
index 00000000..9ac83479
--- /dev/null
+++ b/src/plugins/other-usrbg/users.json
@@ -0,0 +1,6 @@
+{"endpoint":"https://usrbg.dorkbutt.lol","bucket":"usrbg","prefix":"v2/",
+ "users":{
+ "862105885660676146":"db1d",
+ "578012873813524530":"315c"
+ }
+}