Merge 8c6104305b into a015cf96f6

Co-authored-by: Scyye <97131358+Scyye@users.noreply.github.com>

src/plugins/customFolderIcons/README.md

@@ -0,0 +1,14 @@
+# CustomFolderIcons
+
+Allows you to set custom images/svgs as folder icons
+
+Available as "Change Icon" in the folder context menu
+
+![the context menu with the "Change Icon" button](https://github.com/sadan4/Vencord/assets/117494111/3dfb843c-6964-4ac3-a0b9-8772569953d3)
+
+![an image of some example custom folder icons](https://github.com/sadan4/Vencord/assets/117494111/c5324ab1-3b7a-4286-8cb5-41c0ceb2ea44)
+
+![the modal used to customize the folder icons](https://github.com/sadan4/Vencord/assets/117494111/1426d350-56db-4687-8052-6c1b1ce873a1)
+
+
+

src/plugins/customFolderIcons/components.tsx

@@ -0,0 +1,124 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 sadan
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { closeModal, ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
+import { Button, Menu, Slider, TextInput, useState } from "@webpack/common";
+
+import settings, { folderIconsData } from "./settings";
+import { folderProp, int2rgba, setFolderData } from "./util";
+
+export function ImageModal(folderProps: folderProp) {
+    const [data, setData] = useState(((settings.store.folderIcons ?? {}) as folderIconsData)[folderProps.folderId]?.url ?? "");
+    const [size, setSize] = useState(100);
+    return (
+        <>
+            <TextInput
+                // this looks like a horrorshow
+                defaultValue={data}
+                onChange={(val, _n) => {
+                    setData(val);
+                }}
+                placeholder="https://example.com/image.png"
+            >
+            </TextInput>
+            <RenderPreview folderProps={folderProps} url={data} size={size} />
+            {data && <>
+                <div style={{
+                    color: "#FFF"
+                }}>Change the size of the folder icon</div>
+                <Slider
+                    initialValue={100}
+                    onValueChange={(v: number) => {
+                        setSize(v);
+                    }}
+                    maxValue={200}
+                    minValue={25}
+                    // [25, 200]
+                    markers={Array.apply(0, Array(176)).map((_, i) => i + 25)}
+                    stickToMarkers={true}
+                    keyboardStep={1}
+                    renderMarker={() => null} />
+            </>}
+            <Button onClick={() => {
+                setFolderData(folderProps, {
+                    url: data,
+                    size: size
+                });
+                closeModal("custom-folder-icon");
+            }}
+            >
+                Save
+            </Button>
+            <hr />
+            <Button onClick={() => {
+                // INFO: unset button
+                const folderSettings = settings.store.folderIcons as folderIconsData;
+                if (folderSettings[folderProps.folderId]) {
+                    folderSettings[folderProps.folderId] = null;
+                }
+                closeModal("custom-folder-icon");
+            }}>
+                Unset
+            </Button>
+            <hr />
+        </>
+    );
+}
+export function RenderPreview({ folderProps, url, size }: { folderProps: folderProp; url: string; size: number; }) {
+    if (!url) return null;
+    return (
+        <div className="test1234" style={{
+            width: "20vh",
+            height: "20vh",
+            overflow: "hidden",
+            // 16/48
+            borderRadius: "33%",
+            backgroundColor: int2rgba(folderProps.folderColor, 0.4),
+            display: "flex",
+            justifyContent: "center",
+            alignItems: "center"
+        }}>
+            <img src={url} width={`${size}%`} height={`${size}%`} />
+        </div>
+    );
+}
+
+export function makeContextItem(a: folderProp) {
+    return (
+        <Menu.MenuItem
+            id="custom-folder-icons"
+            key="custom-folder-icons"
+            label="Change Icon"
+            action={() => {
+                openModalLazy(async () => {
+                    return props => (
+                        <ModalRoot {...props}>
+                            <ModalHeader >
+                                <div style={{
+                                    color: "white"
+                                }}>
+                            Set a New Icon.
+                                </div>
+                            </ModalHeader>
+                            <ModalContent>
+                                <ImageModal folderId={a.folderId} folderColor={a.folderColor}/>
+                            </ModalContent>
+                            <div style={{
+                                color: "white",
+                                margin: "2.5%",
+                                marginTop: "1%"
+                            }}>
+                                You might have to hover the folder after setting in order for it to refresh.
+                            </div>
+                        </ModalRoot>
+                    );
+                },
+                {
+                    modalKey: "custom-folder-icon"
+                });
+            }}/>
+    );
+}

src/plugins/customFolderIcons/index.tsx

@@ -0,0 +1,60 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 sadan
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+import { makeContextItem } from "./components";
+import settings, { folderIconsData } from "./settings";
+import { folderProp, int2rgba } from "./util";
+
+export default definePlugin({
+    settings,
+    name: "CustomFolderIcons",
+    description: "Customize folder icons with any png",
+    authors: [
+        Devs.sadan
+    ],
+    patches: [
+        {
+            find: ".expandedFolderIconWrapper",
+            replacement: {
+                match: /(return.{0,80}expandedFolderIconWrapper.*,)(\(0,..jsxs\)\(.*]}\))/,
+                replace: "$1$self.shouldReplace(arguments[0])?$self.replace(arguments[0]):$2"
+            }
+        }
+    ],
+    contextMenus: {
+        "guild-context": (menuItems, props: folderProp) => {
+            if(!("folderId" in props)) return;
+            menuItems.push(makeContextItem(props));
+        }
+    },
+    shouldReplace(props: any): boolean{
+        return !!((settings.store.folderIcons as folderIconsData)?.[props.folderNode.id]?.url);
+    },
+    replace(props: any){
+        const folderSettings = (settings.store.folderIcons as folderIconsData);
+        if(folderSettings && folderSettings[props.folderNode.id]){
+            const data = folderSettings[props.folderNode.id];
+            return (
+                <div
+                    style={{
+                        backgroundColor: int2rgba(props.folderNode.color, +settings.store.solidIcon || .4),
+                        display: "flex",
+                        justifyContent: "center",
+                        alignItems: "center",
+                        width: "100%",
+                        height: "100%"
+                    }}
+                >
+                    <img src={data!.url} width={`${data!.size ?? 100}%`} height={`${data!.size ?? 100}%`}
+                    />
+                </div>
+            );
+        }
+    }
+});

src/plugins/customFolderIcons/settings.tsx

@@ -0,0 +1,29 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 sadan
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { OptionType } from "@utils/types";
+
+export interface folderIcon{
+    url: string,
+    size: number,
+}
+export type folderIconsData = Record<string, folderIcon | null>;
+
+const settings = definePluginSettings({
+    solidIcon: {
+        type: OptionType.BOOLEAN,
+        default: false,
+        description: "Use a solid background on the background of the image"
+    },
+    folderIcons: {
+        type: OptionType.COMPONENT,
+        hidden: true,
+        description: "folder icon settings",
+        component: () => <></>
+    }
+});
+export default settings;

src/plugins/customFolderIcons/util.tsx

@@ -0,0 +1,29 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 sadan
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import settings, { folderIcon, folderIconsData } from "./settings";
+
+export async function setFolderData(props: folderProp, newData: folderIcon) {
+    if(!settings.store.folderIcons){
+        settings.store.folderIcons = {};
+    }
+    const folderSettings = (settings.store.folderIcons as folderIconsData);
+    folderSettings[props.folderId] = newData;
+}
+export interface folderProp {
+    folderId: string;
+    folderColor: number;
+}
+/**
+    * @param rgbVal RGB value
+    * @param alpha alpha bewteen zero and 1
+    */
+export function int2rgba(rgbVal: number, alpha: number = 1) {
+    const b = rgbVal & 0xFF,
+        g = (rgbVal & 0xFF00) >>> 8,
+        r = (rgbVal & 0xFF0000) >>> 16;
+    return `rgba(${[r, g, b].join(",")},${alpha})`;
+}

src/plugins/userVoiceShow/components.tsx

@@ -8,7 +8,7 @@ import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { classes } from "@utils/misc";
 import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, GuildStore, IconUtils, NavigationRouter, PermissionsBits, PermissionStore, showToast, Text, Toasts, Tooltip, useCallback, useMemo, UserStore, useStateFromStores } from "@webpack/common";
+import { ChannelStore, GuildStore, IconUtils, NavigationRouter, PermissionsBits, PermissionStore, React, showToast, Text, Toasts, Tooltip, useMemo, UserStore, useStateFromStores } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
 const cl = classNameFactory("vc-uvs-");
@@ -17,7 +17,7 @@ const { selectVoiceChannel } = findByPropsLazy("selectChannel", "selectVoiceChan
 const VoiceStateStore = findStoreLazy("VoiceStateStore");
 const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
 
-interface IconProps extends React.HTMLAttributes<HTMLDivElement> {
+interface IconProps extends React.ComponentPropsWithoutRef<"div"> {
     size?: number;
 }
 
@@ -71,23 +71,18 @@ 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(() => {
+    });
-        return guild?.icon == null ? undefined : IconUtils.getGuildIconURL({
-            id: guild.id,
-            icon: guild.icon,
-            size: 30
-        });
-    }, [guild]);
 
     return (
         <>
@@ -103,7 +98,7 @@ function VoiceChannelTooltip({ channel }: VoiceChannelTooltipProps) {
                 <UserSummaryItem
                     users={users}
                     renderIcon={false}
-                    max={7}
+                    max={13}
                     size={18}
                 />
             </div>
@@ -119,11 +114,14 @@ const clickTimers = {} as Record<string, any>;
 
 export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: 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;
+
+    function onClick(e: React.MouseEvent) {
         e.preventDefault();
         e.stopPropagation();
+
         if (channel == null || channelId == null) return;
 
         if (!PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel)) {
@@ -147,18 +145,15 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChanne
                 delete clickTimers[channelId];
             }, 250);
         }
-    }, [channelId]);
+    }
 
-    const isLocked = useMemo(() => {
+    const isLocked = !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || !PermissionStore.can(PermissionsBits.CONNECT, channel);
-        return !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || !PermissionStore.can(PermissionsBits.CONNECT, channel);
-    }, [channelId]);
-
-    if (channel == null) return null;
 
     return (
         <Tooltip
             text={<VoiceChannelTooltip channel={channel} />}
             tooltipClassName={cl("tooltip-container")}
+            tooltipContentClassName={cl("tooltip-content")}
         >
             {props =>
                 isLocked ?

src/plugins/userVoiceShow/index.tsx

@@ -32,7 +32,7 @@ const settings = definePluginSettings({
         default: true,
         restartNeeded: true
     },
-    showInVoiceMemberList: {
+    showInMemberList: {
         type: OptionType.BOOLEAN,
         description: "Show a user's Voice Channel indicator in the member and DMs list",
         default: true,
@@ -82,12 +82,12 @@ export default definePlugin({
                 match: /\.subtext,children:.+?}\)\]}\)(?=])/,
                 replace: "$&,$self.VoiceChannelIndicator({userId:arguments[0]?.user?.id})"
             },
-            predicate: () => settings.store.showInVoiceMemberList
+            predicate: () => settings.store.showInMemberList
         }
     ],
 
     start() {
-        if (settings.store.showInVoiceMemberList) {
+        if (settings.store.showInMemberList) {
             addDecorator("UserVoiceShow", ({ user }) => user == null ? null : <VoiceChannelIndicator userId={user.id} />);
         }
     },

src/plugins/userVoiceShow/style.css

@@ -15,7 +15,13 @@
 }
 
 .vc-uvs-tooltip-container {
-    max-width: 200px;
+    max-width: 300px;
+}
+
+.vc-uvs-tooltip-content {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
 }
 
 .vc-uvs-guild-name {
@@ -31,7 +37,5 @@
 
 .vc-uvs-vc-members {
     display: flex;
-    margin: 8px 0;
-    flex-direction: row;
     gap: 6px;
 }