Merge 4f6e980dc4 into b875ebf92d

Co-authored-by: vee <vendicated@riseup.net>

src/plugins/fullSearchContext/README.md

@@ -0,0 +1,5 @@
+# FullSearchContext
+
+Makes the message context menu in message search results have all options you'd expect.
+
+![](https://github.com/user-attachments/assets/472d1327-3935-44c7-b7c4-0978b5348550)

src/plugins/fullSearchContext/index.tsx

@@ -0,0 +1,82 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 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 { migratePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { ChannelStore, ContextMenuApi, i18n, UserStore } from "@webpack/common";
+import { Message } from "discord-types/general";
+import type { MouseEvent } from "react";
+
+const { useMessageMenu } = findByPropsLazy("useMessageMenu");
+
+function MessageMenu({ message, channel, onHeightUpdate }) {
+    const canReport = message.author &&
+        !(message.author.id === UserStore.getCurrentUser().id || message.author.system);
+
+    return useMessageMenu({
+        navId: "message-actions",
+        ariaLabel: i18n.Messages.MESSAGE_UTILITIES_A11Y_LABEL,
+
+        message,
+        channel,
+        canReport,
+        onHeightUpdate,
+        onClose: () => ContextMenuApi.closeContextMenu(),
+
+        textSelection: "",
+        favoriteableType: null,
+        favoriteableId: null,
+        favoriteableName: null,
+        itemHref: void 0,
+        itemSrc: void 0,
+        itemSafeSrc: void 0,
+        itemTextContent: void 0,
+    });
+}
+
+migratePluginSettings("FullSearchContext", "SearchReply");
+export default definePlugin({
+    name: "FullSearchContext",
+    description: "Makes the message context menu in message search results have all options you'd expect",
+    authors: [Devs.Ven, Devs.Aria],
+
+    patches: [{
+        find: "onClick:this.handleMessageClick,",
+        replacement: {
+            match: /this(?=\.handleContextMenu\(\i,\i\))/,
+            replace: "$self"
+        }
+    }],
+
+    handleContextMenu(event: MouseEvent, message: Message) {
+        const channel = ChannelStore.getChannel(message.channel_id);
+        if (!channel) return;
+
+        event.stopPropagation();
+
+        ContextMenuApi.openContextMenu(event, contextMenuProps =>
+            <MessageMenu
+                message={message}
+                channel={channel}
+                onHeightUpdate={contextMenuProps.onHeightUpdate}
+            />
+        );
+    }
+});

src/plugins/searchReply/README.md

@@ -1,6 +0,0 @@
-# SearchReply
-
-Adds a reply button to search results.
-
-![the plugin in action](https://github.com/Vendicated/Vencord/assets/45497981/07e741d3-0f97-4e5c-82b0-80712ecf2cbb)
-

src/plugins/searchReply/index.tsx

@@ -1,75 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 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 { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
-import { ReplyIcon } from "@components/Icons";
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { findByCodeLazy } from "@webpack";
-import { ChannelStore, i18n, Menu, PermissionsBits, PermissionStore, SelectedChannelStore } from "@webpack/common";
-import { Message } from "discord-types/general";
-
-
-const replyToMessage = findByCodeLazy(".TEXTAREA_FOCUS)", "showMentionToggle:");
-
-const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => {
-    // make sure the message is in the selected channel
-    if (SelectedChannelStore.getChannelId() !== message.channel_id) return;
-    const channel = ChannelStore.getChannel(message?.channel_id);
-    if (!channel) return;
-    if (channel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
-
-    // dms and group chats
-    const dmGroup = findGroupChildrenByChildId("pin", children);
-    if (dmGroup && !dmGroup.some(child => child?.props?.id === "reply")) {
-        const pinIndex = dmGroup.findIndex(c => c?.props.id === "pin");
-        dmGroup.splice(pinIndex + 1, 0, (
-            <Menu.MenuItem
-                id="reply"
-                label={i18n.Messages.MESSAGE_ACTION_REPLY}
-                icon={ReplyIcon}
-                action={(e: React.MouseEvent) => replyToMessage(channel, message, e)}
-            />
-        ));
-        return;
-    }
-
-    // servers
-    const serverGroup = findGroupChildrenByChildId("mark-unread", children);
-    if (serverGroup && !serverGroup.some(child => child?.props?.id === "reply")) {
-        serverGroup.unshift((
-            <Menu.MenuItem
-                id="reply"
-                label={i18n.Messages.MESSAGE_ACTION_REPLY}
-                icon={ReplyIcon}
-                action={(e: React.MouseEvent) => replyToMessage(channel, message, e)}
-            />
-        ));
-        return;
-    }
-};
-
-
-export default definePlugin({
-    name: "SearchReply",
-    description: "Adds a reply button to search results",
-    authors: [Devs.Aria],
-    contextMenus: {
-        "message": messageContextMenuPatch
-    }
-});

src/plugins/userVoiceShow/components.tsx

@@ -103,7 +103,7 @@ function VoiceChannelTooltip({ channel }: VoiceChannelTooltipProps) {
                 <UserSummaryItem
                     users={users}
                     renderIcon={false}
-                    max={7}
+                    max={14}
                     size={18}
                 />
             </div>
@@ -159,6 +159,7 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChanne
         <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;
 }

src/plugins/webhookManager.desktop/README.MD

@@ -0,0 +1,21 @@
+# WebhookManager
+Manage your webhooks easily; delete, send messages, get detailed info and more.
+
+## Commands
+
+- /webhook send - *Sends a message through a webhook.*
+- /webhook delete -  *Deletes any webhook that is specified.*
+- /webhook info - *Gets advanced details on the webhook such as the name, profile pic, server and channel ID, and additionally, information on person who created it*
+
+<details>
+	<summary>Full /webhookinfo Output</summary>
+
+  - Webhook Username
+  - Webhook ID
+  - Webhook Token
+  - Channel ID
+  - Server ID
+  - Webhook Profile Picture
+  - Webhook Type
+  - Creator Profile
+</details>

src/plugins/webhookManager.desktop/index.tsx

@@ -0,0 +1,176 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
+import { Devs } from "@utils/constants";
+import { Margins } from "@utils/margins";
+import { ModalContent, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import definePlugin, { PluginNative } from "@utils/types";
+import { Button, Forms, React, Switch, TextInput, useState } from "@webpack/common";
+
+const Native = VencordNative.pluginHelpers.WebhookManager as PluginNative<typeof import("./native")>;
+let url, content, username, avatarUrl = "";
+let jsonMode = false;
+
+// TODO: add sending as raw
+function WebhookMessageModal(props: ModalProps) {
+    const [params, setParams] = useState({ content: "", username: "", avatarUrl: "", url: "", jsonMode: false });
+
+    const onURL = (url: string) => setParams(prev => ({ ...prev, url }));
+    const onContent = (content: string) => setParams(prev => ({ ...prev, content }));
+    const onUsername = (username: string) => setParams(prev => ({ ...prev, username }));
+    const onAvatar = (avatarUrl: string) => setParams(prev => ({ ...prev, avatarUrl }));
+    const onSwitch = (jsonMode: boolean) => setParams(prev => ({ ...prev, jsonMode }));
+
+
+    return <ModalRoot {...props} size={ModalSize.MEDIUM} className={"wm-send-webhook"} >
+        <ModalContent className="wm-send-webhook-content">
+            <Forms.FormTitle className={Margins.top20}>Webhook URL</Forms.FormTitle>
+            <TextInput
+                placeholder={"Webhook URL"}
+                value={params.url}
+                onChange={onURL}
+            />
+            <Forms.FormTitle className={Margins.top20}>Webhook Message</Forms.FormTitle>
+            <TextInput
+                placeholder={"Content"}
+                value={params.content}
+                onChange={onContent}
+            />
+            <Forms.FormTitle className={Margins.top20}>Webhook Username</Forms.FormTitle>
+            <TextInput
+                placeholder={"Username"}
+                value={params.username}
+                onChange={onUsername}
+            />
+            <Forms.FormTitle className={Margins.top20}>Webhook Avatar URL</Forms.FormTitle>
+            <TextInput
+                placeholder={"Image URL"}
+                value={params.avatarUrl}
+                onChange={onAvatar}
+            />
+            <Switch
+                key="wm-raw"
+                value={jsonMode}
+                onChange={onSwitch}
+            >Send as Raw JSON</Switch>
+            <Button
+                onClick={() => {
+                    if (jsonMode !== true) {
+                        Native.executeWebhook(params.url, {
+                            content: params.content,
+                            username: params.username,
+                            avatar_url: params.avatarUrl
+                        });
+                    }
+                    else {
+                        Native.executeWebhook(params.url, {
+                            webhookMessage: params.content,
+                            username: params.username,
+                            avatar_url: params.avatarUrl
+                        });
+                    }
+
+                }}
+            >Send Webhook</Button>
+        </ModalContent>
+    </ModalRoot >;
+}
+
+
+export default definePlugin({
+    name: "WebhookManager",
+    description: "Manage your webhooks easily; delete, send messages, get detailed info and more.",
+    authors: [Devs.Byeoon, Devs.Ven],
+    dependencies: ["CommandsAPI"],
+    commands: [
+        {
+            name: "webhook delete",
+            description: "Delete a webhook.",
+            inputType: ApplicationCommandInputType.BUILT_IN,
+            options: [
+                {
+                    name: "url",
+                    description: "The URL of the webhook",
+                    type: ApplicationCommandOptionType.STRING,
+                    required: true
+                }
+            ],
+            execute: async (option, ctx) => {
+                try {
+                    await fetch(findOption(option, "url", ""), {
+                        method: "DELETE"
+                    });
+                    sendBotMessage(ctx.channel.id, {
+                        content: "The webhook has deleted successfully."
+                    });
+                }
+                catch (error) {
+                    sendBotMessage(ctx.channel.id, {
+                        content: "There was an error deleting the webhook. Did you input a valid webhook URL? Error: " + error
+                    });
+                }
+            }
+        },
+        {
+            name: "webhook info",
+            description: "Retrieve information about a webhook.",
+            inputType: ApplicationCommandInputType.BUILT_IN,
+            options: [
+                {
+                    name: "url",
+                    description: "The URL of the webhook",
+                    type: ApplicationCommandOptionType.STRING,
+                    required: true
+                }
+            ],
+            execute: async (option, ctx) => {
+                const webhookUrl = findOption(option, "url", "");
+                const { user, avatar, name, id, token, type, channel_id, guild_id }
+                    = await fetch(webhookUrl).then(res => res.json());
+
+                sendBotMessage(ctx.channel.id, {
+                    content: `This webhook was created by ${user?.name}.`,
+                    embeds: [
+                        {
+                            title: "Webhook Information",
+                            color: "1323",
+                            // @ts-ignore
+                            author: {
+                                name,
+                                url: ""
+                            },
+                            thumbnail: {
+                                url: `https://cdn.discordapp.com/avatars/${id}/${avatar}.png`,
+                                proxyURL: `https://cdn.discordapp.com/avatars/${id}/${avatar}.png`,
+                                height: 128,
+                                width: 128
+                            },
+                            description: `
+                                Webhook ID: ${id}
+                                Webhook Token: ${token}
+                                Webhook Type: ${type}
+                                Channel ID: ${channel_id}
+                                Server ID: ${guild_id}
+                            `
+                        }
+                    ]
+                });
+            }
+        },
+        {
+            name: "webhook send",
+            description: "Send a message through a webhook.",
+            inputType: ApplicationCommandInputType.BUILT_IN,
+            async execute(_, ctx) {
+                openModal(props => <WebhookMessageModal {...props} />);
+                sendBotMessage(ctx.channel.id, {
+                    content: "Your webhook message has been executed."
+                });
+            }
+        }
+    ]
+});

src/plugins/webhookManager.desktop/native.ts

@@ -0,0 +1,22 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { IpcMainInvokeEvent } from "electron";
+import https from "https";
+
+const DiscordHosts = new Set(["discord.com", "ptb.discord.com", "canary.discord.com"]);
+
+export function executeWebhook(_event: IpcMainInvokeEvent, url: string, body: object) {
+    const { hostname, pathname } = new URL(url);
+
+    if (!DiscordHosts.has(hostname) || !pathname.startsWith("/api/webhooks/")) {
+        throw new Error("This URL is not a valid webhook.");
+    }
+
+    const req = https.request(url, { method: "POST", headers: { "Content-Type": "application/json", } });
+    req.write(JSON.stringify(body));
+    req.end();
+}

src/utils/constants.ts

@@ -475,7 +475,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Sqaaakoi",
         id: 259558259491340288n
     },
-    Byron: {
+    Byeoon: {
         name: "byeoon",
         id: 1167275288036655133n
     },