Merge branch 'main' of https://www.coastalcommits.com/cswimr/Vencord

This reverts & edits commit 3b295e1f6f.

package.json

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

scripts/generateReport.ts

@@ -225,7 +225,7 @@ page.on("console", async e => {
                     plugin,
                     type,
                     id,
-                    match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
+                    match: regex.replace(/\(\?:\[A-Za-z_\$\]\[\\w\$\]\*\)/g, "\\i"),
                     error: await maybeGetError(e.args()[3])
                 });
 

src/components/VencordSettings/PatchHelperTab.tsx

@@ -247,7 +247,7 @@ function FullPatchInput({ setFind, setParsedFind, setMatch, setReplacement }: Fu
         }
 
         try {
-            const parsed = (0, eval)(`(${fullPatch})`) as Patch;
+            const parsed = (0, eval)(`([${fullPatch}][0])`) as Patch;
 
             if (!parsed.find) throw new Error("No 'find' field");
             if (!parsed.replacement) throw new Error("No 'replacement' field");

src/plugins/_core/noTrack.ts

@@ -59,15 +59,7 @@ export default definePlugin({
                     replace: "$&return;"
                 }
             ]
-        },
-        {
-            find: ".installedLogHooks)",
-            replacement: {
-                // if getDebugLogging() returns false, the hooks don't get installed.
-                match: "getDebugLogging(){",
-                replace: "getDebugLogging(){return false;"
         }
-        },
     ],
 
     startAt: StartAt.Init,

src/plugins/_core/settings.tsx

@@ -65,7 +65,7 @@ export default definePlugin({
                     replace: (_, sectionTypes, commaOrSemi, elements, element) => `${commaOrSemi} $self.addSettings(${elements}, ${element}, ${sectionTypes}) ${commaOrSemi}`
                 },
                 {
-                    match: /({(?=.+?function (\i).{0,120}(\i)=\i\.useMemo.{0,60}return \i\.useMemo\(\(\)=>\i\(\3).+?function\(\){return )\2(?=})/,
+                    match: /({(?=.+?function (\i).{0,160}(\i)=\i\.useMemo.{0,140}return \i\.useMemo\(\(\)=>\i\(\3).+?function\(\){return )\2(?=})/,
                     replace: (_, rest, settingsHook) => `${rest}$self.wrapSettingsHook(${settingsHook})`
                 }
             ]

src/plugins/betterFolders/index.tsx

@@ -275,16 +275,16 @@ export default definePlugin({
     },
 
     makeGuildsBarGuildListFilter(isBetterFolders: boolean) {
-        try {
             return child => {
                 if (isBetterFolders) {
+                    try {
                         return child?.props?.["aria-label"] === getIntlMessage("SERVERS");
+                    } catch (e) {
+                        console.error(e);
+                    }
                 }
                 return true;
             };
-        } catch {
-            return true;
-        }
     },
 
     makeGuildsBarTreeFilter(isBetterFolders: boolean) {

src/plugins/consoleJanitor/index.ts

@@ -130,6 +130,34 @@ export default definePlugin({
                 replace: ""
             }
         },
+        // Zustand section
+        {
+            find: "[DEPRECATED] Passing a vanilla store will be unsupported in a future version. Instead use `import { useStore } from 'zustand'`.",
+            replacement: [
+                {
+                    match: /&&console\.warn\("\[DEPRECATED\] Passing a vanilla store will be unsupported in a future version\. Instead use `import { useStore } from 'zustand'`\."\)/,
+                    replace: ""
+                },
+                {
+                    match: /console\.warn\("\[DEPRECATED\] Use `createWithEqualityFn` instead of `create` or use `useStoreWithEqualityFn` instead of `useStore`\. They can be imported from 'zustand\/traditional'\. https:\/\/github\.com\/pmndrs\/zustand\/discussions\/1937"\),/,
+                    replace: ""
+                }
+            ]
+        },
+        {
+            find: "[DEPRECATED] `getStorage`, `serialize` and `deserialize` options are deprecated. Use `storage` option instead.",
+            replacement: {
+                match: /console\.warn\("\[DEPRECATED\] `getStorage`, `serialize` and `deserialize` options are deprecated\. Use `storage` option instead\."\),/,
+                replace: ""
+            }
+        },
+        {
+            find: "[DEPRECATED] `context` will be removed in a future version. Instead use `import { createStore, useStore } from 'zustand'`. See: https://github.com/pmndrs/zustand/discussions/1180.",
+            replacement: {
+                match: /console\.warn\("\[DEPRECATED\] `context` will be removed in a future version\. Instead use `import { createStore, useStore } from 'zustand'`\. See: https:\/\/github\.com\/pmndrs\/zustand\/discussions\/1180\."\);/,
+                replace: ""
+            }
+        },
         // Patches discords generic logger function
         {
             find: "Σ:",
@@ -147,5 +175,5 @@ export default definePlugin({
                 replace: "$self.NoopLogger()"
             }
         }
-    ],
+    ]
 });

src/plugins/decor/lib/stores/AuthorizationStore.tsx

@@ -93,7 +93,7 @@ export const useAuthorizationStore = proxyLazy(() => zustandCreate(
         } as AuthorizationState),
         {
             name: "decor-auth",
-            getStorage: () => indexedDBStorage,
+            storage: indexedDBStorage,
             partialize: state => ({ tokens: state.tokens }),
             onRehydrateStorage: () => state => state?.init()
         }

src/plugins/decor/lib/stores/UsersDecorationsStore.ts

@@ -95,10 +95,13 @@ export const useUsersDecorationsStore = proxyLazy(() => zustandCreate((set: any,
 } as UsersDecorationsState)));
 
 export function useUserDecorAvatarDecoration(user?: User): AvatarDecoration | null | undefined {
+    try {
         const [decorAvatarDecoration, setDecorAvatarDecoration] = useState<string | null>(user ? useUsersDecorationsStore.getState().getAsset(user.id) ?? null : null);
 
         useEffect(() => {
-        const destructor = useUsersDecorationsStore.subscribe(
+            const destructor = (() => {
+                try {
+                    return useUsersDecorationsStore.subscribe(
                         state => {
                             if (!user) return;
                             const newDecorAvatarDecoration = state.getAsset(user.id);
@@ -106,13 +109,25 @@ export function useUserDecorAvatarDecoration(user?: User): AvatarDecoration | nu
                             if (decorAvatarDecoration !== newDecorAvatarDecoration) setDecorAvatarDecoration(newDecorAvatarDecoration);
                         }
                     );
+                } catch {
+                    return () => { };
+                }
+            })();
 
+            try {
                 if (user) {
                     const { fetch: fetchUserDecorAvatarDecoration } = useUsersDecorationsStore.getState();
                     fetchUserDecorAvatarDecoration(user.id);
                 }
+            } catch { }
+
             return destructor;
         }, []);
 
         return decorAvatarDecoration ? { asset: decorAvatarDecoration, skuId: SKU_ID } : null;
+    } catch (e) {
+        console.error(e);
+    }
+
+    return null;
 }

src/plugins/messageLogger/index.tsx

@@ -28,7 +28,7 @@ import { getIntlMessage } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import { classes } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ChannelStore, FluxDispatcher, Menu, MessageStore, Parser, SelectedChannelStore, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
 import { Message } from "discord-types/general";
 
@@ -43,7 +43,6 @@ interface MLMessage extends Message {
 }
 
 const styles = findByPropsLazy("edited", "communicationDisabled", "isSystemMessage");
-const getMessage = findByCodeLazy('replace(/^\\n+|\\n+$/g,"")');
 
 function addDeleteStyle() {
     if (Settings.plugins.MessageLogger.deleteStyle === "text") {
@@ -312,9 +311,8 @@ export default definePlugin({
         );
     },
 
-    Messages: {
     // DELETED_MESSAGE_COUNT: getMessage("{count, plural, =0 {No deleted messages} one {{count} deleted message} other {{count} deleted messages}}")
-        // TODO: find a better way to generate intl messages
+    // TODO: Find a better way to generate intl messages
     DELETED_MESSAGE_COUNT: () => ({
         ast: [[
             6,
@@ -339,8 +337,7 @@ export default definePlugin({
             0,
             "cardinal"
         ]]
-        })
+    }),
-    },
 
     patches: [
         {
@@ -531,7 +528,7 @@ export default definePlugin({
                 },
                 {
                     match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\?.*?:/,
-                    replace: '$&$1.type==="MESSAGE_GROUP_DELETED"?$self.Messages.DELETED_MESSAGE_COUNT:',
+                    replace: '$&$1.type==="MESSAGE_GROUP_DELETED"?$self.DELETED_MESSAGE_COUNT:',
                 },
             ],
             predicate: () => Settings.plugins.MessageLogger.collapseDeleted

src/plugins/noBlockedMessages/index.ts

@@ -28,8 +28,8 @@ import { Message } from "discord-types/general";
 const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
 
 interface MessageDeleteProps {
-    // i18n message i18n.t["+FcYMz"] if deleted, with args
+    // Internal intl message for BLOCKED_MESSAGE_COUNT
-    collapsedReason: () => any
+    collapsedReason: () => any;
 }
 
 export default definePlugin({

src/plugins/relationshipNotifier/utils.ts

@@ -50,6 +50,8 @@ async function runMigrations() {
 
 export async function syncAndRunChecks() {
     await runMigrations();
+    if (UserStore.getCurrentUser() == null) return;
+
     const [oldGuilds, oldGroups, oldFriends] = await DataStore.getMany([
         guildsKey(),
         groupsKey(),

src/plugins/typingIndicator/index.tsx

@@ -24,7 +24,7 @@ import { Devs } from "@utils/constants";
 import { getIntlMessage } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { findComponentByCodeLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, GuildMemberStore, RelationshipStore, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
+import { GuildMemberStore, RelationshipStore, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
 import { buildSeveralUsers } from "../typingTweaks";
 
@@ -44,7 +44,7 @@ function getDisplayName(guildId: string, userId: string) {
     return GuildMemberStore.getNick(guildId, userId) ?? (user as any).globalName ?? user.username;
 }
 
-function TypingIndicator({ channelId }: { channelId: string; }) {
+function TypingIndicator({ channelId, guildId }: { channelId: string; guildId: string; }) {
     const typingUsers: Record<string, number> = useStateFromStores(
         [TypingStore],
         () => ({ ...TypingStore.getTypingUsers(channelId) as Record<string, number> }),
@@ -57,7 +57,6 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
         }
     );
     const currentChannelId: string = useStateFromStores([SelectedChannelStore], () => SelectedChannelStore.getChannelId());
-    const guildId = ChannelStore.getChannel(channelId).guild_id;
 
     if (!settings.store.includeMutedChannels) {
         const isChannelMuted = UserGuildSettingsStore.isChannelMuted(guildId, channelId);
@@ -165,7 +164,7 @@ export default definePlugin({
             find: "UNREAD_IMPORTANT:",
             replacement: {
                 match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
-                replace: "$&,$self.TypingIndicator($1.id)"
+                replace: "$&,$self.TypingIndicator($1.id,$1.getGuildId())"
             }
         },
         // Theads
@@ -174,14 +173,14 @@ export default definePlugin({
             find: "M11 9H4C2.89543 9 2 8.10457 2 7V1C2 0.447715 1.55228 0 1 0C0.447715 0 0 0.447715 0 1V7C0 9.20914 1.79086 11 4 11H11C11.5523 11 12 10.5523 12 10C12 9.44771 11.5523 9 11 9Z",
             replacement: {
                 match: /mentionsCount:\i.+?null(?<=channel:(\i).+?)/,
-                replace: "$&,$self.TypingIndicator($1.id)"
+                replace: "$&,$self.TypingIndicator($1.id,$1.getGuildId())"
             }
         }
     ],
 
-    TypingIndicator: (channelId: string) => (
+    TypingIndicator: (channelId: string, guildId: string) => (
         <ErrorBoundary noop>
-            <TypingIndicator channelId={channelId} />
+            <TypingIndicator channelId={channelId} guildId={guildId} />
         </ErrorBoundary>
     ),
 });

src/plugins/typingTweaks/index.tsx

@@ -129,14 +129,22 @@ export default definePlugin({
     buildSeveralUsers,
 
     mutateChildren(props: any, users: User[], children: any) {
-        if (!Array.isArray(children)) return children;
+        try {
+            if (!Array.isArray(children)) {
+                return children;
+            }
 
             let element = 0;
 
             return children.map(c =>
-            c.type === "strong"
+                c.type === "strong" || (typeof c !== "string" && !React.isValidElement(c))
                     ? <TypingUser {...props} user={users[element++]} />
                     : c
             );
+        } catch (e) {
+            console.error(e);
+        }
+
+        return children;
     }
 });

src/utils/patches.ts

@@ -21,8 +21,8 @@ import { Patch, PatchReplacement, ReplaceFn } from "./types";
 
 export function canonicalizeMatch<T extends RegExp | string>(match: T): T {
     let partialCanon = typeof match === "string" ? match : match.source;
-    partialCanon = partialCanon.replaceAll(/#{intl::([A-Za-z_$][\w$]*)}/g, (_, key) => {
+    partialCanon = partialCanon.replaceAll(/#{intl::([\w$+/]*)(?:::(\w+))?}/g, (_, key, modifier) => {
-        const hashed = runtimeHashMessageKey(key);
+        const hashed = modifier === "raw" ? key : runtimeHashMessageKey(key);
 
         const isString = typeof match === "string";
         const hasSpecialChars = !Number.isNaN(Number(hashed[0])) || hashed.includes("+") || hashed.includes("/");
@@ -40,7 +40,7 @@ export function canonicalizeMatch<T extends RegExp | string>(match: T): T {
         return partialCanon as T;
     }
 
-    const canonSource = partialCanon.replaceAll(String.raw`\i`, String.raw`(?:[A-Za-z_$][\w$]*)`);
+    const canonSource = partialCanon.replaceAll("\\i", String.raw`(?:[A-Za-z_$][\w$]*)`);
     return new RegExp(canonSource, match.flags) as T;
 }
 

src/webpack/common/utils.ts

@@ -163,9 +163,13 @@ waitFor(["open", "saveAccountChanges"], m => SettingsRouter = m);
 
 export const PermissionsBits: t.PermissionsBits = findLazy(m => typeof m.ADMINISTRATOR === "bigint");
 
-export const zustandCreate = findByCodeLazy("will be removed in v4");
+export const { zustandCreate } = mapMangledModuleLazy(["useSyncExternalStoreWithSelector:", "Object.assign", /(\i)\?(\i)\(\1\):\2/], {
+    zustandCreate: filters.byCode(/(\i)\?(\i)\(\1\):\2/)
+});
 
-export const zustandPersist = findByCodeLazy("[zustand persist middleware]");
+export const { zustandPersist } = mapMangledModuleLazy(".onRehydrateStorage)?", {
+    zustandPersist: filters.byCode(/(\(\i,\i\))=>.+?\i\1/)
+});
 
 export const MessageActions = findByPropsLazy("editMessage", "sendMessage");
 export const MessageCache = findByPropsLazy("clearCache", "_channelMessages");
@@ -181,7 +185,7 @@ export const ExpressionPickerStore: t.ExpressionPickerStore = mapMangledModuleLa
     toggleExpressionPicker: filters.byCode(/getState\(\)\.activeView===\i\?\i\(\):\i\(/),
     setExpressionPickerView: filters.byCode(/setState\({activeView:\i,lastActiveView:/),
     setSearchQuery: filters.byCode("searchQuery:"),
-    useExpressionPickerStore: filters.byCode("Object.is")
+    useExpressionPickerStore: filters.byCode(/\(\i,\i=\i\)=>/)
 });
 
 export const PopoutActions: t.PopoutActions = mapMangledModuleLazy('type:"POPOUT_WINDOW_OPEN"', {