From 700301ffbb3d44d319f8e53243be3e1076e4c960 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 5 Sep 2023 01:37:06 -0300
Subject: [PATCH] Patch guild header popout context too

---
 src/plugins/permissionsViewer/index.tsx |  4 ++--
 src/plugins/serverProfile/index.tsx     | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 480efc15..7de29b35 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -178,12 +178,12 @@ export default definePlugin({
     start() {
         addContextMenuPatch("user-context", this.userContextMenuPatch);
         addContextMenuPatch("channel-context", this.channelContextMenuPatch);
-        addContextMenuPatch("guild-context", this.guildContextMenuPatch);
+        addContextMenuPatch(["guild-context", "guild-header-popout"], this.guildContextMenuPatch);
     },
 
     stop() {
         removeContextMenuPatch("user-context", this.userContextMenuPatch);
         removeContextMenuPatch("channel-context", this.channelContextMenuPatch);
-        removeContextMenuPatch("guild-context", this.guildContextMenuPatch);
+        removeContextMenuPatch(["guild-context", "guild-header-popout"], this.guildContextMenuPatch);
     },
 });
diff --git a/src/plugins/serverProfile/index.tsx b/src/plugins/serverProfile/index.tsx
index eed7e35a..c27f8cd5 100644
--- a/src/plugins/serverProfile/index.tsx
+++ b/src/plugins/serverProfile/index.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { Menu } from "@webpack/common";
@@ -13,13 +13,15 @@ import { Guild } from "discord-types/general";
 import { openGuildProfileModal } from "./GuildProfileModal";
 
 const Patch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild; }) => () => {
-    children.splice(-1, 0, (
+    const group = findGroupChildrenByChildId("privacy", children);
+
+    group?.push(
         <Menu.MenuItem
             id="vc-server-profile"
             label="Server Profile"
             action={() => openGuildProfileModal(guild)}
         />
-    ));
+    );
 };
 
 export default definePlugin({
@@ -29,10 +31,10 @@ export default definePlugin({
     tags: ["guild", "info"],
 
     start() {
-        addContextMenuPatch("guild-context", Patch);
+        addContextMenuPatch(["guild-context", "guild-header-popout"], Patch);
     },
 
     stop() {
-        removeContextMenuPatch("guild-context", Patch);
+        removeContextMenuPatch(["guild-context", "guild-header-popout"], Patch);
     }
 });