Merge remote-tracking branch 'upstream/dev' into dev

src/components/settings/tabs/plugins/components/Common.tsx

@@ -36,7 +36,7 @@ export function resolveError(isValidResult: boolean | string) {
 interface SettingsSectionProps extends PropsWithChildren {
     name: string;
     description: string;
-    error: string | null;
+    error?: string | null;
     inlineSetting?: boolean;
 }
 

src/plugins/consoleJanitor/index.tsx

@@ -6,11 +6,10 @@
 
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { Flex } from "@components/Flex";
+import { SettingsSection } from "@components/settings/tabs/plugins/components/Common";
 import { Devs } from "@utils/constants";
-import { Margins } from "@utils/margins";
 import definePlugin, { defineDefault, OptionType, StartAt } from "@utils/types";
-import { Checkbox, Forms, Text } from "@webpack/common";
+import { Checkbox, Text } from "@webpack/common";
 
 const Noop = () => { };
 const NoopLogger = {
@@ -58,15 +57,13 @@ function AllowLevelSetting({ settingKey }: AllowLevelSettingProps) {
 
 const AllowLevelSettings = ErrorBoundary.wrap(() => {
     return (
-        <Forms.FormSection>
-            <Forms.FormTitle tag="h3">Filter List</Forms.FormTitle>
-            <Forms.FormText className={Margins.bottom8}>Always allow loggers of these types</Forms.FormText>
-            <Flex flexDirection="row">
+        <SettingsSection name="Filter List" description="Always allow loggers of these types">
+            <div style={{ display: "flex", flexDirection: "row" }}>
                 {Object.keys(settings.store.allowLevel).map(key => (
                     <AllowLevelSetting key={key} settingKey={key as keyof AllowLevels} />
                 ))}
-            </Flex>
-        </Forms.FormSection>
+            </div>
+        </SettingsSection>
     );
 });
 

src/plugins/mutualGroupDMs/index.tsx

@@ -109,14 +109,14 @@ export default definePlugin({
         },
         // User Profile Modal v2
         {
-            find: ".WIDGETS?(",
+            find: ".tabBarPanel,{[",
             replacement: [
                 {
                     match: /items:(\i),.+?(?=return\(0,\i\.jsxs?\)\("div)/,
                     replace: "$&$self.pushSection($1,arguments[0].user);"
                 },
                 {
-                    match: /(?:\.tabBarPanel|\.WIDGETS\}\)),children:(?=.+?section:(\i))/,
+                    match: /\.tabBarPanel,.+?children:(?=.+?section:(\i))/,
                     replace: "$&$1==='MUTUAL_GDMS'?$self.renderMutualGDMs(arguments[0]):"
                 },
                 // Make the gap between each item smaller so our tab can fit.