Merge branch 'Vendicated:main' into main

package.json

@@ -1,7 +1,7 @@
 {
  "name": "vencord",
  "private": "true",
- "version": "1.8.9",
+ "version": "1.9.0",
  "description": "The cutest Discord client mod",
  "homepage": "https://github.com/Vendicated/Vencord#readme",
  "bugs": {

scripts/generateReport.ts

@@ -46,7 +46,8 @@ await page.setBypassCSP(true);
 
 async function maybeGetError(handle: JSHandle): Promise<string | undefined> {
  return await (handle as JSHandle<Error>)?.getProperty("message")
- .then(m => m?.jsonValue());
+ .then(m => m?.jsonValue())
+ .catch(() => undefined);
 }
 
 const report = {

src/api/Commands/commandHelpers.ts

@@ -17,14 +17,14 @@
 */
 
 import { mergeDefaults } from "@utils/mergeDefaults";
-import { findByPropsLazy } from "@webpack";
+import { findByCodeLazy } from "@webpack";
 import { MessageActions, SnowflakeUtils } from "@webpack/common";
 import { Message } from "discord-types/general";
 import type { PartialDeep } from "type-fest";
 
 import { Argument } from "./types";
 
-const MessageCreator = findByPropsLazy("createBotMessage");
+const createBotMessage = findByCodeLazy('username:"Clyde"');
 
 export function generateId() {
  return `-${SnowflakeUtils.fromTimestamp(Date.now())}`;
@@ -37,7 +37,7 @@ export function generateId() {
  * @returns {Message}
  */
 export function sendBotMessage(channelId: string, message: PartialDeep<Message>): Message {
- const botMessage = MessageCreator.createBotMessage({ channelId, content: "", embeds: [] });
+ const botMessage = createBotMessage({ channelId, content: "", embeds: [] });
 
  MessageActions.receiveMessage(channelId, mergeDefaults(message, botMessage));
 

src/api/SettingsStores.ts

@@ -0,0 +1,69 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+*/
+
+import { proxyLazy } from "@utils/lazy";
+import { Logger } from "@utils/Logger";
+import { findModuleId, proxyLazyWebpack, wreq } from "@webpack";
+
+import { Settings } from "./Settings";
+
+interface Setting<T> {
+ /**
+ * Get the setting value
+ */
+ getSetting(): T;
+ /**
+ * Update the setting value
+ * @param value The new value
+ */
+ updateSetting(value: T | ((old: T) => T)): Promise<void>;
+ /**
+ * React hook for automatically updating components when the setting is updated
+ */
+ useSetting(): T;
+ settingsStoreApiGroup: string;
+ settingsStoreApiName: string;
+}
+
+export const SettingsStores: Array<Setting<any>> | undefined = proxyLazyWebpack(() => {
+ const modId = findModuleId('"textAndImages","renderSpoilers"') as any;
+ if (modId == null) return new Logger("SettingsStoreAPI").error("Didn't find stores module.");
+
+ const mod = wreq(modId);
+ if (mod == null) return;
+
+ return Object.values(mod).filter((s: any) => s?.settingsStoreApiGroup) as any;
+});
+
+/**
+ * Get the store for a setting
+ * @param group The setting group
+ * @param name The name of the setting
+ */
+export function getSettingStore<T = any>(group: string, name: string): Setting<T> | undefined {
+ if (!Settings.plugins.SettingsStoreAPI.enabled) throw new Error("Cannot use SettingsStoreAPI without setting as dependency.");
+
+ return SettingsStores?.find(s => s?.settingsStoreApiGroup === group && s?.settingsStoreApiName === name);
+}
+
+/**
+ * getSettingStore but lazy
+ */
+export function getSettingStoreLazy<T = any>(group: string, name: string) {
+ return proxyLazy(() => getSettingStore<T>(group, name));
+}

src/api/index.ts

@@ -31,6 +31,7 @@ import * as $Notices from "./Notices";
 import * as $Notifications from "./Notifications";
 import * as $ServerList from "./ServerList";
 import * as $Settings from "./Settings";
+import * as $SettingsStores from "./SettingsStores";
 import * as $Styles from "./Styles";
 
 /**
@@ -116,3 +117,5 @@ export const ChatButtons = $ChatButtons;
  * An API allowing you to update and re-render messages
  */
 export const MessageUpdater = $MessageUpdater;
+
+export const SettingsStores = $SettingsStores;

src/debug/loadLazyChunks.ts

@@ -25,7 +25,7 @@ export async function loadLazyChunks() {
  // True if resolved, false otherwise
  const chunksSearchPromises = [] as Array<() => boolean>;
 
- const LazyChunkRegex = canonicalizeMatch(/(?:(?:Promise\.all\(\[)?(\i\.e\("[^)]+?"\)[^\]]*?)(?:\]\))?)\.then\(\i\.bind\(\i,"([^)]+?)"\)\)/g);
+ const LazyChunkRegex = canonicalizeMatch(/(?:(?:Promise\.all\(\[)?(\i\.e\("?[^)]+?"?\)[^\]]*?)(?:\]\))?)\.then\(\i\.bind\(\i,"?([^)]+?)"?\)\)/g);
 
  async function searchAndLoadLazyChunks(factoryCode: string) {
  const lazyChunks = factoryCode.matchAll(LazyChunkRegex);

src/plugins/_api/badges/index.tsx

@@ -93,7 +93,7 @@ export default definePlugin({
  {
  find: ".PANEL]:14",
  replacement: {
- match: /(?<=(\i)=\(0,\i\.default\)\(\i\);)return 0===\i.length\?/,
+ match: /(?<=(\i)=\(0,\i\.\i\)\(\i\);)return 0===\i.length\?/,
  replace: "$1.unshift(...$self.getBadges(arguments[0].displayProfile));$&"
  }
  },

src/plugins/_api/chatButtons.ts

@@ -15,8 +15,8 @@ export default definePlugin({
  patches: [{
  find: '"sticker")',
  replacement: {
- match: /!\i\.isMobile(?=.+?(\i)\.push\(.{0,50}"gift")/,
- replace: "$& &&(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),true)"
+ match: /return\(!\i\.\i&&(?=\(\i\.isDM.+?(\i)\.push\(.{0,50}"gift")/,
+ replace: "$&(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),true)&&"
  }
  }]
 });

src/plugins/_api/messageEvents.ts

@@ -35,7 +35,7 @@ export default definePlugin({
  }
  },
  {
- find: ".handleSendMessage",
+ find: ".handleSendMessage,onResize",
  replacement: {
  // props.chatInputType...then((function(isMessageValid)... var parsedMessage = b.c.parse(channel,... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply);
  // Lookbehind: validateMessage)({openWarningPopout:..., type: i.props.chatInputType, content: t, stickers: r, ...}).then((function(isMessageValid)

src/plugins/_api/settingsStores.ts

@@ -0,0 +1,43 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+*/
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+ name: "SettingsStoreAPI",
+ description: "Patches Discord's SettingsStores to expose their group and name",
+ authors: [Devs.Nuckyz],
+
+ patches: [
+ {
+ find: ",updateSetting:",
+ replacement: [
+ {
+ match: /(?<=INFREQUENT_USER_ACTION.{0,20}),useSetting:/,
+ replace: ",settingsStoreApiGroup:arguments[0],settingsStoreApiName:arguments[1]$&"
+ },
+ // some wrapper. just make it copy the group and name
+ {
+ match: /updateSetting:.{0,20}shouldSync/,
+ replace: "settingsStoreApiGroup:arguments[0].settingsStoreApiGroup,settingsStoreApiName:arguments[0].settingsStoreApiName,$&"
+ }
+ ]
+ }
+ ]
+});

src/plugins/_core/settings.tsx

@@ -84,18 +84,11 @@ export default definePlugin({
  replace: (_, sectionTypes, commaOrSemi, elements, element) => `${commaOrSemi} $self.addSettings(${elements}, ${element}, ${sectionTypes}) ${commaOrSemi}`
  }
  },
- {
- find: "useDefaultUserSettingsSections:function",
- replacement: {
- match: /(?<=useDefaultUserSettingsSections:function\(\){return )(\i)\}/,
- replace: "$self.wrapSettingsHook($1)}"
- }
- },
  {
  find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
  replacement: {
- match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.UserSettingsSections\).*?(\i)\.default\.open\()/,
- replace: "$2.default.open($1);return;"
+ match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.\i\).*?(\i\.\i)\.open\()/,
+ replace: "$2.open($1);return;"
  }
  }
  ],
@@ -182,7 +175,7 @@ export default definePlugin({
  patchedSettings: new WeakSet(),
 
  addSettings(elements: any[], element: { header?: string; settings: string[]; }, sectionTypes: SectionTypes) {
- if (this.patchedSettings.has(elements)) return;
+ if (this.patchedSettings.has(elements) || !this.isRightSpot(element)) return;
 
  this.patchedSettings.add(elements);
 

src/plugins/alwaysTrust/index.ts

@@ -49,7 +49,7 @@ export default definePlugin({
  predicate: () => settings.store.domain
  },
  {
- find: "isSuspiciousDownload:",
+ find: "bitbucket.org",
  replacement: {
  match: /function \i\(\i\){(?=.{0,60}\.parse\(\i\))/,
  replace: "$&return null;"

src/plugins/arRPC.web/index.tsx

@@ -20,10 +20,10 @@ import { popNotice, showNotice } from "@api/Notices";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
 import definePlugin, { ReporterTestable } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByCodeLazy } from "@webpack";
 import { ApplicationAssetUtils, FluxDispatcher, Forms, Toasts } from "@webpack/common";
 
-const RpcUtils = findByPropsLazy("fetchApplicationsRPC", "getRemoteIconURL");
+const fetchApplicationsRPC = findByCodeLazy("APPLICATION_RPC(", "Client ID");
 
 async function lookupAsset(applicationId: string, key: string): Promise<string> {
  return (await ApplicationAssetUtils.fetchAssetIds(applicationId, [key]))[0];
@@ -32,7 +32,7 @@ async function lookupAsset(applicationId: string, key: string): Promise<string>
 const apps: any = {};
 async function lookupApp(applicationId: string): Promise<string> {
  const socket: any = {};
- await RpcUtils.fetchApplicationsRPC(socket, applicationId);
+ await fetchApplicationsRPC(socket, applicationId);
  return socket.application;
 }
 

src/plugins/banger/index.ts

@@ -27,7 +27,7 @@ export default definePlugin({
  {
  find: "BAN_CONFIRM_TITLE.",
  replacement: {
- match: /src:\i\("\d+"\)/g,
+ match: /src:\i\("?\d+"?\)/g,
  replace: "src: Vencord.Settings.plugins.BANger.source"
  }
  }

src/plugins/betterFolders/index.tsx

@@ -19,7 +19,7 @@
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
 import { FluxDispatcher, i18n, useMemo } from "@webpack/common";
 
 import FolderSideBar from "./FolderSideBar";
@@ -30,7 +30,7 @@ enum FolderIconDisplay {
  MoreThanOneFolderExpanded
 }
 
-const { GuildsTree } = findByPropsLazy("GuildsTree");
+const GuildsTree = findLazy(m => m.prototype?.moveNextTo);
 const SortedGuildStore = findStoreLazy("SortedGuildStore");
 export const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
 const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");
@@ -117,7 +117,7 @@ export default definePlugin({
  },
  // If we are rendering the Better Folders sidebar, we filter out guilds that are not in folders and unexpanded folders
  {
- match: /\[(\i)\]=(\(0,\i\.useStateFromStoresArray\).{0,40}getGuildsTree\(\).+?}\))(?=,)/,
+ match: /\[(\i)\]=(\(0,\i\.\i\).{0,40}getGuildsTree\(\).+?}\))(?=,)/,
  replace: (_, originalTreeVar, rest) => `[betterFoldersOriginalTree]=${rest},${originalTreeVar}=$self.getGuildTree(!!arguments[0].isBetterFolders,betterFoldersOriginalTree,arguments[0].betterFoldersExpandedIds)`
  },
  // If we are rendering the Better Folders sidebar, we filter out everything but the servers and folders from the GuildsBar Guild List children
@@ -139,13 +139,13 @@ export default definePlugin({
  },
  {
  // This is the parent folder component
- find: ".MAX_GUILD_FOLDER_NAME_LENGTH,",
+ find: ".toggleGuildFolderExpand(",
  predicate: () => settings.store.sidebar && settings.store.showFolderIcon !== FolderIconDisplay.Always,
  replacement: [
  {
  // Modify the expanded state to instead return the list of expanded folders
- match: /(useStateFromStores\).{0,20}=>)(\i\.\i)\.isFolderExpanded\(\i\)/,
- replace: (_, rest, ExpandedGuildFolderStore) => `${rest}${ExpandedGuildFolderStore}.getExpandedFolders()`,
+ match: /(\],\(\)=>)(\i\.\i)\.isFolderExpanded\(\i\)\)/,
+ replace: (_, rest, ExpandedGuildFolderStore) => `${rest}${ExpandedGuildFolderStore}.getExpandedFolders())`,
  },
  {
  // Modify the expanded prop to use the boolean if the above patch fails, or check if the folder is expanded from the list if it succeeds
@@ -196,7 +196,7 @@ export default definePlugin({
  ]
  },
  {
- find: "APPLICATION_LIBRARY,render",
+ find: "APPLICATION_LIBRARY,render:",
  predicate: () => settings.store.sidebar,
  replacement: {
  // Render the Better Folders sidebar

src/plugins/betterGifAltText/index.ts

@@ -36,7 +36,7 @@ export default definePlugin({
  {
  find: ".Messages.GIF,",
  replacement: {
- match: /alt:(\i)=(\i\.default\.Messages\.GIF)(?=,[^}]*\}=(\i))/,
+ match: /alt:(\i)=(\i\.\i\.Messages\.GIF)(?=,[^}]*\}=(\i))/,
  replace:
  // rename prop so we can always use default value
  "alt_$$:$1=$self.altify($3)||$2",

src/plugins/betterGifPicker/index.ts

@@ -13,7 +13,7 @@ export default definePlugin({
  authors: [Devs.Samwich],
  patches: [
  {
- find: ".GIFPickerResultTypes.SEARCH",
+ find: '"state",{resultType:',
  replacement: [{
  match: /(?<="state",{resultType:)null/,
  replace: '"Favorites"'

src/plugins/betterRoleContext/index.tsx

@@ -5,15 +5,18 @@
  */
 
 import { definePluginSettings } from "@api/Settings";
+import { getSettingStoreLazy } from "@api/SettingsStores";
 import { ImageIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { getCurrentGuild, openImageModal } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Clipboard, GuildStore, Menu, PermissionStore, TextAndImagesSettingsStores } from "@webpack/common";
+import { Clipboard, GuildStore, Menu, PermissionStore } from "@webpack/common";
 
 const GuildSettingsActions = findByPropsLazy("open", "selectRole", "updateGuild");
 
+const DeveloperMode = getSettingStoreLazy("appearance", "developerMode")!;
+
 function PencilIcon() {
  return (
  <svg
@@ -62,12 +65,13 @@ export default definePlugin({
  name: "BetterRoleContext",
  description: "Adds options to copy role color / edit role / view role icon when right clicking roles in the user profile",
  authors: [Devs.Ven, Devs.goodbee],
+ dependencies: ["SettingsStoreAPI"],
 
  settings,
 
  start() {
  // DeveloperMode needs to be enabled for the context menu to be shown
- TextAndImagesSettingsStores.DeveloperMode.updateSetting(true);
+ DeveloperMode.updateSetting(true);
  },
 
  contextMenus: {