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

package.json

@@ -1,7 +1,7 @@
 {
     "name": "equicord",
     "private": "true",
-    "version": "1.10.1",
+    "version": "1.10.2",
     "description": "The other cutest Discord client mod",
     "homepage": "https://github.com/Equicord/Equicord#readme",
     "bugs": {

src/plugins/clearURLs/defaultRules.ts

@@ -158,4 +158,5 @@ export const defaultRules = [
     "igshid",
     "igsh",
     "share_id@reddit.com",
+    "si@soundcloud.com",
 ];

src/plugins/showHiddenThings/index.ts

@@ -112,12 +112,12 @@ export default definePlugin({
         },
         // patch request that queries if term is allowed
         {
-            find: ".GUILD_DISCOVERY_VALID_TERM",
+            find: ".GUILD_DISCOVERY_VALID_TERM,query:",
             predicate: () => settings.store.disableDisallowedDiscoveryFilters,
             all: true,
             replacement: {
-                match: /\i\.\i\.get\(\{url:\i\.\i\.GUILD_DISCOVERY_VALID_TERM,query:\{term:\i\},oldFormErrors:!0\}\);/g,
+                match: /\i\.\i\.get\(\{url:\i\.\i\.GUILD_DISCOVERY_VALID_TERM,query:\{term:\i\},oldFormErrors:!0\}\)/g,
-                replace: "Promise.resolve({ body: { valid: true } });"
+                replace: "Promise.resolve({ body: { valid: true } })"
             }
         }
     ],

src/plugins/userVoiceShow/components.tsx

@@ -7,17 +7,24 @@
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { classes } from "@utils/misc";
-import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
+import { filters, findByCodeLazy, findByPropsLazy, findComponentByCodeLazy, findStoreLazy, mapMangledModuleLazy } from "@webpack";
-import { ChannelStore, GuildStore, IconUtils, NavigationRouter, PermissionsBits, PermissionStore, showToast, Text, Toasts, Tooltip, useCallback, useMemo, UserStore, useStateFromStores } from "@webpack/common";
+import { ChannelStore, GuildStore, IconUtils, match, NavigationRouter, P, PermissionsBits, PermissionStore, React, showToast, Text, Toasts, Tooltip, useMemo, UserStore, useStateFromStores } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
 const cl = classNameFactory("vc-uvs-");
 
-const { selectVoiceChannel } = findByPropsLazy("selectChannel", "selectVoiceChannel");
+const { selectVoiceChannel } = findByPropsLazy("selectVoiceChannel", "selectChannel");
+const { useChannelName } = mapMangledModuleLazy(".Messages.GROUP_DM_ALONE", {
+    useChannelName: filters.byCode("()=>null==")
+});
+const getDMChannelIcon = findByCodeLazy(".getChannelIconURL({");
 const VoiceStateStore = findStoreLazy("VoiceStateStore");
-const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
 
-interface IconProps extends React.HTMLAttributes<HTMLDivElement> {
+const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
+const Avatar = findComponentByCodeLazy(".AVATAR_STATUS_TYPING_16;");
+const GroupDMAvatars = findComponentByCodeLazy(".AvatarSizeSpecs[", "getAvatarURL");
+
+interface IconProps extends React.ComponentPropsWithoutRef<"div"> {
     size?: number;
 }
 
@@ -28,7 +35,7 @@ function SpeakerIcon(props: IconProps) {
         <div
             {...props}
             role={props.onClick != null ? "button" : undefined}
-            className={classes(cl("speaker"), props.onClick != null ? cl("clickable") : undefined)}
+            className={classes(cl("speaker"), props.onClick != null ? cl("clickable") : undefined, props.className)}
         >
             <svg
                 width={props.size}
@@ -50,7 +57,7 @@ function LockedSpeakerIcon(props: IconProps) {
         <div
             {...props}
             role={props.onClick != null ? "button" : undefined}
-            className={classes(cl("speaker"), props.onClick != null ? cl("clickable") : undefined)}
+            className={classes(cl("speaker"), props.onClick != null ? cl("clickable") : undefined, props.className)}
         >
             <svg
                 width={props.size}
@@ -71,39 +78,46 @@ interface VoiceChannelTooltipProps {
 
 function VoiceChannelTooltip({ channel }: VoiceChannelTooltipProps) {
     const voiceStates = useStateFromStores([VoiceStateStore], () => VoiceStateStore.getVoiceStatesForChannel(channel.id));
+
     const users = useMemo(
         () => Object.values<any>(voiceStates).map(voiceState => UserStore.getUser(voiceState.userId)).filter(user => user != null),
         [voiceStates]
     );
 
-    const guild = useMemo(
+    const guild = channel.getGuildId() == null ? undefined : GuildStore.getGuild(channel.getGuildId());
-        () => channel.getGuildId() == null ? undefined : GuildStore.getGuild(channel.getGuildId()),
+    const guildIcon = guild?.icon == null ? undefined : IconUtils.getGuildIconURL({
-        [channel]
+        id: guild.id,
-    );
+        icon: guild.icon,
+        size: 30
+    });
 
-    const guildIcon = useMemo(() => {
+    const channelIcon = match(channel.type)
-        return guild?.icon == null ? undefined : IconUtils.getGuildIconURL({
+        .with(P.union(1, 3), () => {
-            id: guild.id,
+            return channel.recipients.length >= 2 && channel.icon == null
-            icon: guild.icon,
+                ? <GroupDMAvatars recipients={channel.recipients} size="SIZE_32" />
-            size: 30
+                : <Avatar src={getDMChannelIcon(channel)} size="SIZE_32" />;
-        });
+        })
-    }, [guild]);
+        .otherwise(() => null);
+    const channelName = useChannelName(channel);
 
     return (
         <>
             {guild != null && (
-                <div className={cl("guild-name")}>
+                <div className={cl("name")}>
                     {guildIcon != null && <img className={cl("guild-icon")} src={guildIcon} alt="" />}
                     <Text variant="text-sm/bold">{guild.name}</Text>
                 </div>
             )}
-            <Text variant="text-sm/semibold">{channel.name}</Text>
+            <div className={cl("name")}>
+                {channelIcon}
+                <Text variant="text-sm/semibold">{channelName}</Text>
+            </div>
             <div className={cl("vc-members")}>
                 <SpeakerIcon size={18} />
                 <UserSummaryItem
                     users={users}
                     renderIcon={false}
-                    max={14}
+                    max={13}
                     size={18}
                 />
             </div>
@@ -113,20 +127,28 @@ function VoiceChannelTooltip({ channel }: VoiceChannelTooltipProps) {
 
 interface VoiceChannelIndicatorProps {
     userId: string;
+    isActionButton?: boolean;
+    isMessageIndicator?: boolean;
 }
 
 const clickTimers = {} as Record<string, any>;
 
-export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChannelIndicatorProps) => {
+export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId, isActionButton, isMessageIndicator }: VoiceChannelIndicatorProps) => {
     const channelId = useStateFromStores([VoiceStateStore], () => VoiceStateStore.getVoiceStateForUser(userId)?.channelId as string | undefined);
-    const channel = useMemo(() => channelId == null ? undefined : ChannelStore.getChannel(channelId), [channelId]);
 
-    const onClick = useCallback((e: React.MouseEvent) => {
+    const channel = channelId == null ? undefined : ChannelStore.getChannel(channelId);
+    if (channel == null) return null;
+
+    const isDM = channel.isDM() || channel.isMultiUserDM();
+    const isLocked = !isDM && (!PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || !PermissionStore.can(PermissionsBits.CONNECT, channel));
+
+    function onClick(e: React.MouseEvent) {
         e.preventDefault();
         e.stopPropagation();
+
         if (channel == null || channelId == null) return;
 
-        if (!PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel)) {
+        if (!isDM && !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel)) {
             showToast("You cannot view the user's Voice Channel", Toasts.Type.FAILURE);
             return;
         }
@@ -135,7 +157,7 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChanne
         delete clickTimers[channelId];
 
         if (e.detail > 1) {
-            if (!PermissionStore.can(PermissionsBits.CONNECT, channel)) {
+            if (!isDM && !PermissionStore.can(PermissionsBits.CONNECT, channel)) {
                 showToast("You cannot join the user's Voice Channel", Toasts.Type.FAILURE);
                 return;
             }
@@ -147,13 +169,7 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChanne
                 delete clickTimers[channelId];
             }, 250);
         }
-    }, [channelId]);
+    }
-
-    const isLocked = useMemo(() => {
-        return !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || !PermissionStore.can(PermissionsBits.CONNECT, channel);
-    }, [channelId]);
-
-    if (channel == null) return null;
 
     return (
         <Tooltip
@@ -161,11 +177,20 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChanne
             tooltipClassName={cl("tooltip-container")}
             tooltipContentClassName={cl("tooltip-content")}
         >
-            {props =>
+            {props => {
-                isLocked ?
+                const iconProps: IconProps = {
-                    <LockedSpeakerIcon {...props} onClick={onClick} />
+                    ...props,
-                    : <SpeakerIcon {...props} onClick={onClick} />
+                    className: isActionButton ? cl("indicator-action-button") : cl("speaker-padding"),
-            }
+                    size: isActionButton ? 20 : undefined,
+                    onClick
+                };
+
+                return <div className={isMessageIndicator ? cl("message-indicator") : undefined}>
+                    {isLocked ?
+                        <LockedSpeakerIcon {...iconProps} />
+                        : <SpeakerIcon {...iconProps} />}
+                </div>;
+            }}
         </Tooltip>
     );
 }, { noop: true });

src/plugins/userVoiceShow/index.tsx

@@ -19,6 +19,7 @@
 import "./style.css";
 
 import { addDecorator, removeDecorator } from "@api/MemberListDecorators";
+import { addDecoration, removeDecoration } from "@api/MessageDecorations";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
@@ -37,13 +38,19 @@ const settings = definePluginSettings({
         description: "Show a user's Voice Channel indicator in the member and DMs list",
         default: true,
         restartNeeded: true
+    },
+    showInMessages: {
+        type: OptionType.BOOLEAN,
+        description: "Show a user's Voice Channel indicator in messages",
+        default: true,
+        restartNeeded: true
     }
 });
 
 export default definePlugin({
     name: "UserVoiceShow",
     description: "Shows an indicator when a user is in a Voice Channel",
-    authors: [Devs.LordElias, Devs.Nuckyz],
+    authors: [Devs.Nuckyz, Devs.LordElias],
     settings,
 
     patches: [
@@ -77,10 +84,10 @@ export default definePlugin({
         }, */
         // Friends List
         {
-            find: ".avatar,animate:",
+            find: "null!=this.peopleListItemRef.current",
             replacement: {
-                match: /\.subtext,children:.+?}\)\]}\)(?=])/,
+                match: /\.actions,children:\[/,
-                replace: "$&,$self.VoiceChannelIndicator({userId:arguments[0]?.user?.id})"
+                replace: "$&$self.VoiceChannelIndicator({userId:this?.props?.user?.id,isActionButton:true}),"
             },
             predicate: () => settings.store.showInMemberList
         }
@@ -90,10 +97,14 @@ export default definePlugin({
         if (settings.store.showInMemberList) {
             addDecorator("UserVoiceShow", ({ user }) => user == null ? null : <VoiceChannelIndicator userId={user.id} />);
         }
+        if (settings.store.showInMessages) {
+            addDecoration("UserVoiceShow", ({ message }) => message?.author == null ? null : <VoiceChannelIndicator userId={message.author.id} isMessageIndicator />);
+        }
     },
 
     stop() {
         removeDecorator("UserVoiceShow");
+        removeDecoration("UserVoiceShow");
     },
 
     VoiceChannelIndicator

src/plugins/userVoiceShow/style.css

@@ -1,6 +1,5 @@
 .vc-uvs-speaker {
     color: var(--interactive-normal);
-    padding: 0 4px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -14,6 +13,26 @@
     color: var(--interactive-hover);
 }
 
+.vc-uvs-speaker-padding {
+    padding: 0 4px;
+}
+
+.vc-uvs-message-indicator {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    top: 2.5px;
+    position: relative;
+}
+
+.vc-uvs-indicator-action-button {
+    background-color: var(--background-secondary);
+    border-radius: 100%;
+    height: 36px;
+    width: 36px;
+    margin-left: 10px;
+}
+
 .vc-uvs-tooltip-container {
     max-width: 300px;
 }
@@ -24,7 +43,7 @@
     gap: 6px;
 }
 
-.vc-uvs-guild-name {
+.vc-uvs-name {
     display: flex;
     align-items: center;
     gap: 8px;