Merge branch 'main' into auto-hide-attachments-support

src/plugins/_api/chatButtons.ts

@@ -16,6 +16,7 @@ export default definePlugin({
         {
             find: '"sticker")',
             replacement: {
+                // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                 match: /return\((!)?\i\.\i(?:\|\||&&)(?=\(\i\.isDM.+?(\i)\.push)/,
                 replace: (m, not, children) => not
                     ? `${m}(Vencord.Api.ChatButtons._injectButtons(${children},arguments[0]),true)&&`

src/plugins/_api/messageEvents.ts

@@ -37,13 +37,9 @@ export default definePlugin({
         {
             find: ".handleSendMessage,onResize",
             replacement: {
-                // FIXME: Simplify this change once all branches share the same code
+                // https://regex101.com/r/hBlXpl/1
-                // props.chatInputType...then((function(isMessageValid)... var parsedMessage = b.c.parse(channel,... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply);
+                match: /let (\i)=\i\.\i\.parse\((\i),.+?let (\i)=\i\.\i\.getSendMessageOptions\(\{.+?\}\);(?<=\)\(({.+?})\)\.then.+?)/,
-                // Lookbehind: validateMessage)({openWarningPopout:..., type: i.props.chatInputType, content: t, stickers: r, ...}).then((function(isMessageValid)
+                replace: (m, parsedMessage, channel, replyOptions, extra) => m +
-                match: /(\{openWarningPopout:.{0,100}type:this.props.chatInputType.+?\.then\((?:async )?)(\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}${rest1.includes("async") ? "" : "async "}${rest2}` +
                     `if(await Vencord.Api.MessageEvents._handlePreSend(${channel}.id,${parsedMessage},${extra},${replyOptions}))` +
                     "return{shouldClear:false,shouldRefocus:true};"
             }
@@ -53,8 +49,7 @@ export default definePlugin({
             replacement: {
                 match: /let\{id:\i}=(\i),{id:\i}=(\i);return \i\.useCallback\((\i)=>\{/,
                 replace: (m, message, channel, event) =>
-                    // the message param is shadowed by the event param, so need to alias them
+                    `const vcMsg=${message},vcChan=${channel};${m}Vencord.Api.MessageEvents._handleClick(vcMsg,vcChan,${event});`
-                    `const vcMsg=${message},vcChan=${channel};${m}Vencord.Api.MessageEvents._handleClick(vcMsg, vcChan, ${event});`
             }
         }
     ]

src/plugins/_core/settings.tsx

@@ -65,6 +65,7 @@ export default definePlugin({
                     replace: (_, sectionTypes, commaOrSemi, elements, element) => `${commaOrSemi} $self.addSettings(${elements}, ${element}, ${sectionTypes}) ${commaOrSemi}`
                 },
                 {
+                    // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                     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/ctrlEnterSend/index.ts

@@ -44,6 +44,7 @@ export default definePlugin({
         {
             find: ".selectPreviousCommandOption(",
             replacement: {
+                // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                 match: /(?<=(\i)\.which(?:!==|===)\i\.\i.ENTER(\|\||&&)).{0,100}(\(0,\i\.\i\)\(\i\)).{0,100}(?=(?:\|\||&&)\(\i\.preventDefault)/,
                 replace: (_, event, condition, codeblock) => `${condition === "||" ? "!" : ""}$self.shouldSubmit(${event},${codeblock})`
             }

src/plugins/fakeNitro/index.tsx

@@ -256,6 +256,7 @@ export default definePlugin({
                 },
                 {
                     // Disallow the emoji for premium locked if the intention doesn't allow it
+                    // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                     match: /(!)?(\i\.\i\.canUseEmojisEverywhere\(\i\))/,
                     replace: (m, not) => not
                         ? `(${m}&&!${IS_BYPASSEABLE_INTENTION})`

src/plugins/fullUserInChatbox/index.tsx

@@ -8,6 +8,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findComponentByCodeLazy } from "@webpack";
+import { UserStore, useStateFromStores } from "@webpack/common";
 import { ReactNode } from "react";
 
 const UserMentionComponent = findComponentByCodeLazy(".USER_MENTION)");
@@ -34,14 +35,19 @@ export default definePlugin({
         }
     ],
 
-    UserMentionComponent: ErrorBoundary.wrap((props: UserMentionComponentProps) => (
+    UserMentionComponent: ErrorBoundary.wrap((props: UserMentionComponentProps) => {
-        <UserMentionComponent
+        const user = useStateFromStores([UserStore], () => UserStore.getUser(props.id));
+        if (user == null) {
+            return props.originalComponent();
+        }
+
+        return <UserMentionComponent
             // This seems to be constant
             className="mention"
             userId={props.id}
             channelId={props.channelId}
-        />
+        />;
-    ), {
+    }, {
         fallback: ({ wrappedProps: { originalComponent } }) => originalComponent()
     })
 });

src/plugins/implicitRelationships/index.ts

@@ -50,9 +50,9 @@ export default definePlugin({
         {
             find: "#{intl::FRIENDS_SECTION_ONLINE}",
             replacement: {
-                match: /(\(0,\i\.jsx\)\(\i\.\i\.Item,\{id:\i\.\i)\.BLOCKED,className:([^\s]+?)\.item,children:\i\.\i\.string\(\i\.\i#{intl::BLOCKED}\)\}\)/,
+                match: /,{id:(\i\.\i)\.BLOCKED,show:.+?className:(\i\.item)/,
-                replace: "$1.IMPLICIT,className:$2.item,children:\"Implicit\"}),$&"
+                replace: (rest, relationShipTypes, className) => `,{id:${relationShipTypes}.IMPLICIT,show:true,className:${className},content:"Implicit"}${rest}`
-            },
+            }
         },
         // Sections content
         {

src/plugins/ircColors/index.ts

@@ -23,11 +23,11 @@ import definePlugin, { OptionType } from "@utils/types";
 import { useMemo } from "@webpack/common";
 
 // Calculate a CSS color string based on the user ID
-function calculateNameColorForUser(id: string) {
+function calculateNameColorForUser(id?: string) {
     const { lightness } = settings.use(["lightness"]);
-    const idHash = useMemo(() => h64(id), [id]);
+    const idHash = useMemo(() => id ? h64(id) : null, [id]);
 
-    return `hsl(${idHash % 360n}, 100%, ${lightness}%)`;
+    return idHash && `hsl(${idHash % 360n}, 100%, ${lightness}%)`;
 }
 
 const settings = definePluginSettings({
@@ -41,13 +41,25 @@ const settings = definePluginSettings({
         restartNeeded: true,
         type: OptionType.BOOLEAN,
         default: true
+    },
+    applyColorOnlyToUsersWithoutColor: {
+        description: "Apply colors only to users who don't have a predefined color",
+        restartNeeded: false,
+        type: OptionType.BOOLEAN,
+        default: false
+    },
+    applyColorOnlyInDms: {
+        description: "Apply colors only in direct messages; do not apply colors in servers.",
+        restartNeeded: false,
+        type: OptionType.BOOLEAN,
+        default: false
     }
 });
 
 export default definePlugin({
     name: "IrcColors",
     description: "Makes username colors in chat unique, like in IRC clients",
-    authors: [Devs.Grzesiek11],
+    authors: [Devs.Grzesiek11, Devs.jamesbt365],
     settings,
 
     patches: [
@@ -70,16 +82,28 @@ export default definePlugin({
 
     calculateNameColorForMessageContext(context: any) {
         const id = context?.message?.author?.id;
-        if (id == null) {
+        const colorString = context?.author?.colorString;
-            return null;
+        const color = calculateNameColorForUser(id);
+
+        if (settings.store.applyColorOnlyInDms && !context?.channel?.isPrivate()) {
+            return colorString;
         }
-        return calculateNameColorForUser(id);
+
+        return (!settings.store.applyColorOnlyToUsersWithoutColor || !colorString)
+            ? color
+            : colorString;
     },
     calculateNameColorForListContext(context: any) {
         const id = context?.user?.id;
-        if (id == null) {
+        const colorString = context?.colorString;
-            return null;
+        const color = calculateNameColorForUser(id);
+
+        if (settings.store.applyColorOnlyInDms && !context?.channel?.isPrivate()) {
+            return colorString;
         }
-        return calculateNameColorForUser(id);
+
+        return (!settings.store.applyColorOnlyToUsersWithoutColor || !colorString)
+            ? color
+            : colorString;
     }
 });

src/plugins/messageTags/index.ts

@@ -89,7 +89,7 @@ export default definePlugin({
     settings,
 
     async start() {
-        // TODO: Remove DataStore tags migration once enough time has passed
+        // TODO(OptionType.CUSTOM Related): Remove DataStore tags migration once enough time has passed
         const oldTags = await DataStore.get<Tag[]>(DATA_KEY);
         if (oldTags != null) {
             // @ts-ignore

src/plugins/noScreensharePreview/index.ts

@@ -1,42 +0,0 @@
-/*
- * 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 { getUserSettingLazy } from "@api/UserSettings";
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-const DisableStreamPreviews = getUserSettingLazy<boolean>("voiceAndVideo", "disableStreamPreviews")!;
-
-// @TODO: Delete this plugin in the future
-export default definePlugin({
-    name: "NoScreensharePreview",
-    description: "Disables screenshare previews from being sent.",
-    authors: [Devs.Nuckyz],
-
-    start() {
-        if (!DisableStreamPreviews.getSetting()) {
-            DisableStreamPreviews.updateSetting(true);
-        }
-    },
-
-    stop() {
-        if (DisableStreamPreviews.getSetting()) {
-            DisableStreamPreviews.updateSetting(false);
-        }
-    }
-});

src/plugins/notificationVolume/index.ts

@@ -25,9 +25,9 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: "_ensureAudio(){",
+            find: "ensureAudio(){",
             replacement: {
-                match: /(?=Math\.min\(\i\.\i\.getOutputVolume\(\)\/100)/,
+                match: /(?=Math\.min\(\i\.\i\.getOutputVolume\(\)\/100)/g,
                 replace: "$self.settings.store.notificationVolume/100*"
             },
         },

src/plugins/openInApp/index.ts

@@ -100,6 +100,7 @@ export default definePlugin({
                     replace: "true"
                 },
                 {
+                    // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                     match: /(!)?\(0,\i\.isDesktop\)\(\)/,
                     replace: (_, not) => not ? "false" : "true"
                 }

src/plugins/permissionFreeWill/index.ts

@@ -46,6 +46,7 @@ export default definePlugin({
             find: "#{intl::ONBOARDING_CHANNEL_THRESHOLD_WARNING}",
             replacement: [
                 {
+                    // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                     match: /{(?:\i:(?:function\(\){return |\(\)=>)\i}?,?){2}}/,
                     replace: m => m.replaceAll(canonicalizeMatch(/(function\(\){return |\(\)=>)\i/g), "$1()=>Promise.resolve(true)")
                 }

src/plugins/pinDms/data.ts

@@ -155,7 +155,7 @@ export function moveChannel(channelId: string, direction: -1 | 1) {
     swapElementsInArray(category.channels, a, b);
 }
 
-// TODO: Remove DataStore PinnedDms migration once enough time has passed
+// TODO(OptionType.CUSTOM Related): Remove DataStore PinnedDms migration once enough time has passed
 async function migrateData() {
     if (Settings.plugins.PinDMs.dmSectioncollapsed != null) {
         settings.store.dmSectionCollapsed = Settings.plugins.PinDMs.dmSectioncollapsed;

src/plugins/showHiddenChannels/index.tsx

@@ -108,6 +108,7 @@ export default definePlugin({
                 },
                 {
                     // Prevent Discord from trying to connect to hidden voice channels
+                    // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                     match: /(?=(\|\||&&)\i\.\i\.selectVoiceChannel\((\i)\.id\))/,
                     replace: (_, condition, channel) => condition === "||"
                         ? `||$self.isHiddenChannel(${channel})`
@@ -124,6 +125,7 @@ export default definePlugin({
         {
             find: ".AUDIENCE),{isSubscriptionGated",
             replacement: {
+                // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                 match: /(!)?(\i)\.isRoleSubscriptionTemplatePreviewChannel\(\)/,
                 replace: (m, not, channel) => not
                     ? `${m}&&!$self.isHiddenChannel(${channel})`
@@ -177,6 +179,7 @@ export default definePlugin({
                 },
                 // Make voice channels also appear as muted if they are muted
                 {
+                    // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                     match: /(?<=\.wrapper:\i\.notInteractive,)(.+?)(if\()?(\i)(?:\)return |\?)(\i\.MUTED)/,
                     replace: (_, otherClasses, isIf, isMuted, mutedClassExpression) => isIf
                         ? `${isMuted}?${mutedClassExpression}:"",${otherClasses}if(${isMuted})return ""`
@@ -190,6 +193,7 @@ export default definePlugin({
                 {
                     // Make muted channels also appear as unread if hide unreads is false, using the HiddenIconWithMutedStyle and the channel is hidden
                     predicate: () => settings.store.hideUnreads === false && settings.store.showMode === ShowMode.HiddenIconWithMutedStyle,
+                    // FIXME(Bundler change related): Remove old compatiblity once enough time has passed
                     match: /(?<=\.LOCKED(?:;if\(|:))(?<={channel:(\i).+?)/,
                     replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },

src/plugins/textReplace/index.tsx

@@ -244,7 +244,7 @@ export default definePlugin({
     },
 
     async start() {
-        // TODO: Remove DataStore rules migrations once enough time has passed
+        // TODO(OptionType.CUSTOM Related): Remove DataStore rules migrations once enough time has passed
         const oldStringRules = await DataStore.get<Rule[]>(STRING_RULES_KEY);
         if (oldStringRules != null) {
             settings.store.stringRules = oldStringRules;