Merge remote-tracking branch 'upstream/main'

src/plugins/_api/badges/index.tsx

@@ -94,7 +94,7 @@ export default definePlugin({
                     replace: "...$1.props,$& $1.image??"
                 },
                 {
-                    match: /(?<=text:(\i)\.description,.{0,200})children:/,
+                    match: /(?<="aria-label":(\i)\.description,.{0,200})children:/,
                     replace: "children:$1.component ? $self.renderBadgeComponent({ ...$1 }) :"
                 },
                 // conditionally override their onClick with badge.onClick if it exists

src/plugins/_api/messageEvents.ts

@@ -31,7 +31,7 @@ export default definePlugin({
                 replace: (_, rest1, rest2, args) => "" +
                     `${rest1}async ${rest2}` +
                     `if(await Vencord.Api.MessageEvents._handlePreEdit(${args}))` +
-                    "return Promise.resolve({shoudClear:true,shouldRefocus:true});"
+                    "return Promise.resolve({shouldClear:false,shouldRefocus:true});"
             }
         },
         {
@@ -39,12 +39,12 @@ export default definePlugin({
             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)
-                match: /(type:this\.props\.chatInputType.+?\.then\()(\i=>\{.+?let (\i)=\i\.\i\.parse\((\i),.+?let (\i)=\i\.\i\.getSendMessageOptionsForReply\(\i\);)(?<=\)\(({.+?})\)\.then.+?)/,
+                match: /(\{openWarningPopout:.{0,100}type:this.props.chatInputType.+?\.then\()(\i=>\{.+?let (\i)=\i\.\i\.parse\((\i),.+?let (\i)=\i\.\i\.getSendMessageOptions\(\{.+?\}\);)(?<=\)\(({.+?})\)\.then.+?)/,
                 // props.chatInputType...then((async function(isMessageValid)... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply); if(await Vencord.api...) return { shoudClear:true, shouldRefocus:true };
                 replace: (_, rest1, rest2, parsedMessage, channel, replyOptions, extra) => "" +
                     `${rest1}async ${rest2}` +
                     `if(await Vencord.Api.MessageEvents._handlePreSend(${channel}.id,${parsedMessage},${extra},${replyOptions}))` +
-                    "return{shoudClear:true,shouldRefocus:true};"
+                    "return{shouldClear:false,shouldRefocus:true};"
             }
         },
         {

src/plugins/accountPanelServerProfile/index.tsx

@@ -16,7 +16,7 @@ import { User } from "discord-types/general";
 interface UserProfileProps {
     popoutProps: Record<string, any>;
     currentUser: User;
-    originalPopout: () => React.ReactNode;
+    OriginalPopout: () => React.ReactNode;
 }
 
 const UserProfile = findComponentByCodeLazy("UserProfilePopoutWrapper: user cannot be undefined");
@@ -73,12 +73,12 @@ export default definePlugin({
             group: true,
             replacement: [
                 {
-                    match: /(?<=\.SIZE_32\)}\);)/,
+                    match: /(?<=\.AVATAR_SIZE\);)/,
                     replace: "$self.useAccountPanelRef();"
                 },
                 {
                     match: /(\.AVATAR,children:.+?renderPopout:(\i)=>){(.+?)}(?=,position)(?<=currentUser:(\i).+?)/,
-                    replace: (_, rest, popoutProps, originalPopout, currentUser) => `${rest}$self.UserProfile({popoutProps:${popoutProps},currentUser:${currentUser},originalPopout:()=>{${originalPopout}}})`
+                    replace: (_, rest, popoutProps, originalPopout, currentUser) => `${rest}$self.UserProfile({popoutProps:${popoutProps},currentUser:${currentUser},OriginalPopout:()=>{${originalPopout}}})`
                 },
                 {
                     match: /\.AVATAR,children:.+?(?=renderPopout:)/,
@@ -112,17 +112,17 @@ export default definePlugin({
         openAlternatePopout = false;
     },
 
-    UserProfile: ErrorBoundary.wrap(({ popoutProps, currentUser, originalPopout }: UserProfileProps) => {
+    UserProfile: ErrorBoundary.wrap(({ popoutProps, currentUser, OriginalPopout }: UserProfileProps) => {
         if (
             (settings.store.prioritizeServerProfile && openAlternatePopout) ||
             (!settings.store.prioritizeServerProfile && !openAlternatePopout)
         ) {
-            return originalPopout();
+            return <OriginalPopout />;
         }
 
         const currentChannel = getCurrentChannel();
         if (currentChannel?.getGuildId() == null) {
-            return originalPopout();
+            return <OriginalPopout />;
         }
 
         return (

src/plugins/consoleShortcuts/index.ts

@@ -179,6 +179,16 @@ export default definePlugin({
     description: "Adds shorter Aliases for many things on the window. Run `shortcutList` for a list.",
     authors: [Devs.Ven],
 
+    patches: [
+        {
+            find: 'this,"_changeCallbacks",',
+            replacement: {
+                match: /\i\(this,"_changeCallbacks",/,
+                replace: "Reflect.defineProperty(this,Symbol.toStringTag,{value:this.getName(),configurable:!0,writable:!0,enumerable:!1}),$&"
+            }
+        }
+    ],
+
     startAt: StartAt.Init,
     start() {
         const shortcuts = makeShortcuts();

src/plugins/fullUserInChatbox/index.tsx

@@ -16,7 +16,7 @@ interface UserMentionComponentProps {
     id: string;
     channelId: string;
     guildId: string;
-    OriginalComponent: ReactNode;
+    OriginalComponent: () => ReactNode;
 }
 
 export default definePlugin({
@@ -29,7 +29,7 @@ export default definePlugin({
             find: ':"text":',
             replacement: {
                 match: /(hidePersonalInformation\).+?)(if\(null!=\i\){.+?return \i)(?=})/,
-                replace: "$1return $self.UserMentionComponent({...arguments[0],OriginalComponent:(()=>{$2})()});"
+                replace: "$1return $self.UserMentionComponent({...arguments[0],OriginalComponent:()=>{$2}});"
             }
         }
     ],
@@ -42,6 +42,6 @@ export default definePlugin({
             channelId={props.channelId}
         />
     ), {
-        fallback: ({ wrappedProps }) => wrappedProps.OriginalComponent
+        fallback: ({ wrappedProps: { OriginalComponent } }) => <OriginalComponent />
     })
 });

src/plugins/revealAllSpoilers/index.ts

@@ -21,7 +21,7 @@ import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 
 const SpoilerClasses = findByPropsLazy("spoilerContent");
-const MessagesClasses = findByPropsLazy("messagesWrapper");
+const MessagesClasses = findByPropsLazy("messagesWrapper", "navigationDescription");
 
 export default definePlugin({
     name: "RevealAllSpoilers",