From ba6d23a31f61841e190e771b1ccc4d5d18e666db Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 9 Jan 2024 17:39:38 +0100
Subject: [PATCH] fix adding View Raw to undesired channel context menus

---
 src/plugins/permissionsViewer/index.tsx |  4 +++-
 src/plugins/viewRaw/index.tsx           | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 985b23842..9e0131e64 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -126,7 +126,9 @@ function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) {
 
 function makeContextMenuPatch(childId: string | string[], type?: MenuItemParentType): NavContextMenuPatchCallback {
     return (children, props) => () => {
-        if (!props || (type === MenuItemParentType.User && !props.user) || (type === MenuItemParentType.Guild && !props.guild)) return children;
+        if (!props) return;
+        if ((type === MenuItemParentType.User && !props.user) || (type === MenuItemParentType.Guild && !props.guild) || (type === MenuItemParentType.Channel && (!props.channel || !props.guild)))
+            return children;
 
         const group = findGroupChildrenByChildId(childId, children);
 
diff --git a/src/plugins/viewRaw/index.tsx b/src/plugins/viewRaw/index.tsx
index f516b5d7a..187dbc4e3 100644
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@@ -117,22 +117,26 @@ const settings = definePluginSettings({
     }
 });
 
-function MakeContextCallback(name: string) {
+function MakeContextCallback(name: "Guild" | "User" | "Channel") {
     const callback: NavContextMenuPatchCallback = (children, props) => () => {
-        if ((name === "Guild" && !props.guild) || (name === "User" && !props.user)) return;
+        const value = props[name.toLowerCase()];
+        if (!value) return;
+        if (props.label === "Channel Actions") return; // random shit like notification settings
+
         const lastChild = children.at(-1);
         if (lastChild?.key === "developer-actions") {
             const p = lastChild.props;
             if (!Array.isArray(p.children))
                 p.children = [p.children];
-            ({ children } = p);
+
+            children = p.children;
         }
 
         children.splice(-1, 0,
             <Menu.MenuItem
                 id={`vc-view-${name.toLowerCase()}-raw`}
                 label="View Raw"
-                action={() => openViewRawModal(JSON.stringify(props[name.toLowerCase()], null, 4), name)}
+                action={() => openViewRawModal(JSON.stringify(value, null, 4), name)}
                 icon={CopyIcon}
             />
         );