From 5454a41243139c22470b4e3c549b8d8bc06f5699 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Mon, 25 Sep 2023 04:27:16 +0200
Subject: [PATCH 1/6] update issue templates

---
 .github/ISSUE_TEMPLATE/blank.yml  | 10 ++++++++++
 .github/ISSUE_TEMPLATE/config.yml |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 .github/ISSUE_TEMPLATE/blank.yml

diff --git a/.github/ISSUE_TEMPLATE/blank.yml b/.github/ISSUE_TEMPLATE/blank.yml
new file mode 100644
index 000000000..ba2b15b0e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/blank.yml
@@ -0,0 +1,10 @@
+name: Blank Issue
+description: Create a blank issue. ALWAYS FIRST USE OUR SUPPORT CHANNEL! ONLY USE THIS FORM IF YOU ARE A CONTRIBUTOR OR WERE TOLD TO DO SO IN THE SUPPORT CHANNEL.
+
+body:
+  - type: textarea
+    id: content
+    attributes:
+      label: Content
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 24b32fe38..bc5d97662 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Vencord Support Server
     url: https://discord.gg/D9uwnFnqmd

From da7f0cfff652b74496e20225854e20b0954ed008 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Tue, 26 Sep 2023 01:38:46 +0200
Subject: [PATCH 2/6] PluginModal: Fix cancel button being white on white in
 light theme

---
 src/components/PluginSettings/PluginModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PluginSettings/PluginModal.tsx b/src/components/PluginSettings/PluginModal.tsx
index 78f3c9db7..d8b949066 100644
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@@ -238,7 +238,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                         <Button
                             onClick={onClose}
                             size={Button.Sizes.SMALL}
-                            color={Button.Colors.WHITE}
+                            color={Button.Colors.PRIMARY}
                             look={Button.Looks.LINK}
                         >
                             Cancel

From f32d25b641dc89b623ec0930396827bfcf4921b2 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Tue, 26 Sep 2023 06:48:09 +0700
Subject: [PATCH 3/6] viewRaw, viewIcons, permissionsViewer: fix some edge
 cases (#1745)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/permissionsViewer/index.tsx | 2 +-
 src/plugins/viewIcons/index.tsx         | 3 ++-
 src/plugins/viewRaw/index.tsx           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 7de29b35c..8f31080ed 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -126,7 +126,7 @@ function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) {
 
 function makeContextMenuPatch(childId: string | string[], type?: MenuItemParentType): NavContextMenuPatchCallback {
     return (children, props) => () => {
-        if (!props) return children;
+        if (!props || (type === MenuItemParentType.User && !props.user) || (type === MenuItemParentType.Guild && !props.guild)) return children;
 
         const group = findGroupChildrenByChildId(childId, children);
 
diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index 3bfe902f9..06a7c0a74 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -83,6 +83,7 @@ function openImage(url: string) {
 }
 
 const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: UserContextProps) => () => {
+    if (!user) return;
     const memberAvatar = GuildMemberStore.getMember(guildId!, user.id)?.avatar || null;
 
     children.splice(-1, 0, (
@@ -111,7 +112,7 @@ const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: U
 };
 
 const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildContextProps) => () => {
-    if(!guild) return;
+    if (!guild) return;
 
     const { id, icon, banner } = guild;
     if (!banner && !icon) return;
diff --git a/src/plugins/viewRaw/index.tsx b/src/plugins/viewRaw/index.tsx
index 60127645c..f516b5d7a 100644
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@@ -119,7 +119,7 @@ const settings = definePluginSettings({
 
 function MakeContextCallback(name: string) {
     const callback: NavContextMenuPatchCallback = (children, props) => () => {
-        if (name === "Guild" && !props.guild) return;
+        if ((name === "Guild" && !props.guild) || (name === "User" && !props.user)) return;
         const lastChild = children.at(-1);
         if (lastChild?.key === "developer-actions") {
             const p = lastChild.props;

From 608a67c9ae4eea61bc532398ed615a4984db2ffc Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Tue, 26 Sep 2023 03:54:59 +0200
Subject: [PATCH 4/6] fix quick/searchReply & MessageClickactions not working
 in dms

---
 src/plugins/messageClickActions/index.ts | 2 +-
 src/plugins/quickReply/index.ts          | 6 ++++--
 src/plugins/searchReply/index.tsx        | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/messageClickActions/index.ts b/src/plugins/messageClickActions/index.ts
index 128cb7c16..08cee4c9f 100644
--- a/src/plugins/messageClickActions/index.ts
+++ b/src/plugins/messageClickActions/index.ts
@@ -71,7 +71,7 @@ export default definePlugin({
             if (!isDeletePressed) {
                 if (event.detail < 2) return;
                 if (settings.store.requireModifier && !event.ctrlKey && !event.shiftKey) return;
-                if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
+                if (channel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
 
                 if (isMe) {
                     if (!settings.store.enableDoubleClickToEdit || EditStore.isEditing(channel.id, msg.id)) return;
diff --git a/src/plugins/quickReply/index.ts b/src/plugins/quickReply/index.ts
index 7a39ec07e..118a51beb 100644
--- a/src/plugins/quickReply/index.ts
+++ b/src/plugins/quickReply/index.ts
@@ -172,7 +172,8 @@ function shouldMention(message) {
 
 // handle next/prev reply
 function nextReply(isUp: boolean) {
-    if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, ChannelStore.getChannel(SelectedChannelStore.getChannelId()))) return;
+    const currChannel = ChannelStore.getChannel(SelectedChannelStore.getChannelId());
+    if (currChannel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, currChannel)) return;
     const message = getNextMessage(isUp, true);
 
     if (!message)
@@ -196,7 +197,8 @@ function nextReply(isUp: boolean) {
 
 // handle next/prev edit
 function nextEdit(isUp: boolean) {
-    if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, ChannelStore.getChannel(SelectedChannelStore.getChannelId()))) return;
+    const currChannel = ChannelStore.getChannel(SelectedChannelStore.getChannelId());
+    if (currChannel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, currChannel)) return;
     const message = getNextMessage(isUp, false);
 
     if (!message)
diff --git a/src/plugins/searchReply/index.tsx b/src/plugins/searchReply/index.tsx
index 98f26e08e..b28ca8ec4 100644
--- a/src/plugins/searchReply/index.tsx
+++ b/src/plugins/searchReply/index.tsx
@@ -32,7 +32,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { messag
     if (SelectedChannelStore.getChannelId() !== message.channel_id) return;
     const channel = ChannelStore.getChannel(message?.channel_id);
     if (!channel) return;
-    if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
+    if (channel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
 
     // dms and group chats
     const dmGroup = findGroupChildrenByChildId("pin", children);

From 837d1fc08334f569da8fe332ee72ef8c8560d9ef Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Tue, 26 Sep 2023 20:47:12 +0100
Subject: [PATCH 5/6] web: fix themes tab (#1756)

---
 src/components/Icons.tsx                      | 19 +++++++++++++++++++
 src/components/VencordSettings/ThemesTab.tsx  |  4 ++--
 .../reviewDB/components/MessageButton.tsx     | 13 +++++++------
 src/plugins/textReplace/index.tsx             |  8 +++-----
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx
index 26364fc94..93b1323e7 100644
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@@ -236,3 +236,22 @@ export function ReplyIcon(props: IconProps) {
         </Icon>
     );
 }
+
+export function DeleteIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            className={classes(props.className, "vc-delete-icon")}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill="currentColor"
+                d="M15 3.999V2H9V3.999H3V5.999H21V3.999H15Z"
+            />
+            <path
+                fill="currentColor"
+                d="M5 6.99902V18.999C5 20.101 5.897 20.999 7 20.999H17C18.103 20.999 19 20.101 19 18.999V6.99902H5ZM11 17H9V11H11V17ZM15 17H13V11H15V17Z"
+            />
+        </Icon>
+    );
+}
diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index 37d06c7c4..573f3b9f1 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -20,6 +20,7 @@ import { useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import { ErrorCard } from "@components/ErrorCard";
 import { Flex } from "@components/Flex";
+import { DeleteIcon } from "@components/Icons";
 import { Link } from "@components/Link";
 import { IsFirefox } from "@utils/constants";
 import { Margins } from "@utils/margins";
@@ -42,7 +43,6 @@ type FileInput = ComponentType<{
 }>;
 
 const InviteActions = findByPropsLazy("resolveInvite");
-const TrashIcon = findByCodeLazy("M5 6.99902V18.999C5 20.101 5.897 20.999");
 const FileInput: FileInput = findByCodeLazy("activateUploadDialogue=");
 const TextAreaProps = findLazy(m => typeof m.textarea === "string");
 
@@ -114,7 +114,7 @@ function ThemeCard({ theme, enabled, onChange, onDelete }: ThemeCardProps) {
             infoButton={
                 IS_WEB && (
                     <div style={{ cursor: "pointer", color: "var(--status-danger" }} onClick={onDelete}>
-                        <TrashIcon />
+                        <DeleteIcon />
                     </div>
                 )
             }
diff --git a/src/plugins/reviewDB/components/MessageButton.tsx b/src/plugins/reviewDB/components/MessageButton.tsx
index 176f4d624..965fd1c1a 100644
--- a/src/plugins/reviewDB/components/MessageButton.tsx
+++ b/src/plugins/reviewDB/components/MessageButton.tsx
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { DeleteIcon } from "@components/Icons";
 import { classes } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
 import { Tooltip } from "@webpack/common";
@@ -31,10 +32,7 @@ export function DeleteButton({ onClick }: { onClick(): void; }) {
                     className={classes(iconClasses.button, iconClasses.dangerous)}
                     onClick={onClick}
                 >
-                    <svg width="16" height="16" viewBox="0 0 20 20">
-                        <path fill="currentColor" d="M15 3.999V2H9V3.999H3V5.999H21V3.999H15Z" />
-                        <path fill="currentColor" d="M5 6.99902V18.999C5 20.101 5.897 20.999 7 20.999H17C18.103 20.999 19 20.101 19 18.999V6.99902H5ZM11 17H9V11H11V17ZM15 17H13V11H15V17Z" />
-                    </svg>
+                    <DeleteIcon width="20" height="20" />
                 </div>
             )}
         </Tooltip>
@@ -50,8 +48,11 @@ export function ReportButton({ onClick }: { onClick(): void; }) {
                     className={iconClasses.button}
                     onClick={onClick}
                 >
-                    <svg width="16" height="16" viewBox="0 0 20 20">
-                        <path fill="currentColor" d="M20,6.002H14V3.002C14,2.45 13.553,2.002 13,2.002H4C3.447,2.002 3,2.45 3,3.002V22.002H5V14.002H10.586L8.293,16.295C8.007,16.581 7.922,17.011 8.076,17.385C8.23,17.759 8.596,18.002 9,18.002H20C20.553,18.002 21,17.554 21,17.002V7.002C21,6.45 20.553,6.002 20,6.002Z" />
+                    <svg width="20" height="20" viewBox="0 0 24 24">
+                        <path
+                            fill="currentColor"
+                            d="M20,6.002H14V3.002C14,2.45 13.553,2.002 13,2.002H4C3.447,2.002 3,2.45 3,3.002V22.002H5V14.002H10.586L8.293,16.295C8.007,16.581 7.922,17.011 8.076,17.385C8.23,17.759 8.596,18.002 9,18.002H20C20.553,18.002 21,17.554 21,17.002V7.002C21,6.45 20.553,6.002 20,6.002Z"
+                        />
                     </svg>
                 </div>
             )}
diff --git a/src/plugins/textReplace/index.tsx b/src/plugins/textReplace/index.tsx
index 45fb6f9bf..5d66d2265 100644
--- a/src/plugins/textReplace/index.tsx
+++ b/src/plugins/textReplace/index.tsx
@@ -20,6 +20,7 @@ import { DataStore } from "@api/index";
 import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
 import { definePluginSettings } from "@api/Settings";
 import { Flex } from "@components/Flex";
+import { DeleteIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import { useForceUpdater } from "@utils/react";
@@ -173,6 +174,7 @@ function TextReplace({ title, rulesArray, rulesKey, update }: TextReplaceProps)
                                     onClick={() => onClickRemove(index)}
                                     style={{
                                         background: "none",
+                                        color: "var(--status-danger)",
                                         ...(index === rulesArray.length - 1
                                             ? {
                                                 visibility: "hidden",
@@ -182,11 +184,7 @@ function TextReplace({ title, rulesArray, rulesKey, update }: TextReplaceProps)
                                         )
                                     }}
                                 >
-                                    <svg width="24" height="24" viewBox="0 0 24 24">
-                                        <title>Delete Rule</title>
-                                        <path fill="var(--status-danger)" d="M15 3.999V2H9V3.999H3V5.999H21V3.999H15Z" />
-                                        <path fill="var(--status-danger)" d="M5 6.99902V18.999C5 20.101 5.897 20.999 7 20.999H17C18.103 20.999 19 20.101 19 18.999V6.99902H5ZM11 17H9V11H11V17ZM15 17H13V11H15V17Z" />
-                                    </svg>
+                                    <DeleteIcon />
                                 </Button>
                             </Flex>
                             {isRegexRules && renderFindError(rule.find)}

From 4facc3cad70fed86828ce7700e8fe11b3504bc0f Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Wed, 27 Sep 2023 04:13:40 +0200
Subject: [PATCH 6/6] webContextMenus: support pasting images

---
 src/plugins/webContextMenus.web/index.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index 4cdbcd984..26ae19c5d 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -218,10 +218,19 @@ export default definePlugin({
     },
 
     async paste() {
-        const text = await navigator.clipboard.readText();
+        const clip = (await navigator.clipboard.read())[0];
+        if (!clip) return;
 
         const data = new DataTransfer();
-        data.setData("text/plain", text);
+        for (const type of clip.types) {
+            if (type === "image/png") {
+                const file = new File([await clip.getType(type)], "unknown.png", { type });
+                data.items.add(file);
+            } else if (type === "text/plain") {
+                const blob = await clip.getType(type);
+                data.setData(type, await blob.text());
+            }
+        }
 
         document.dispatchEvent(
             new ClipboardEvent("paste", {