From 3668a774cb0d18d599c2082dfba3754962ec205a Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 8 May 2025 13:13:05 -0400
Subject: [PATCH] ChannelTabs: Fix MacOS Button Overlay

---
 .../channelTabs/components/ChannelTabsContainer.tsx           | 3 +++
 src/equicordplugins/questCompleter.discordDesktop/index.tsx   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/equicordplugins/channelTabs/components/ChannelTabsContainer.tsx b/src/equicordplugins/channelTabs/components/ChannelTabsContainer.tsx
index 4fd26e76..20ad46e5 100644
--- a/src/equicordplugins/channelTabs/components/ChannelTabsContainer.tsx
+++ b/src/equicordplugins/channelTabs/components/ChannelTabsContainer.tsx
@@ -20,6 +20,8 @@ const PlusSmallIcon = findComponentByCodeLazy("0v-5h5a1");
 
 const cl = classNameFactory("vc-channeltabs-");
 
+const isMac = navigator.platform.toLowerCase().startsWith("mac");
+
 export default function ChannelsTabsContainer(props: BasicChannelTabsProps) {
     const [userId, setUserId] = useState("");
     const { showBookmarkBar, widerTabsAndBookmarks } = settings.use(["showBookmarkBar", "widerTabsAndBookmarks"]);
@@ -66,6 +68,7 @@ export default function ChannelsTabsContainer(props: BasicChannelTabsProps) {
             className={cl("container")}
             ref={ref}
             onContextMenu={e => ContextMenuApi.openContextMenu(e, () => <BasicContextMenu />)}
+            style={{ marginTop: isMac ? "28px" : "0" }}
         >
             <div className={cl("tab-container")}>
                 {openedTabs.map((tab, i) =>
diff --git a/src/equicordplugins/questCompleter.discordDesktop/index.tsx b/src/equicordplugins/questCompleter.discordDesktop/index.tsx
index bd85c6d0..19a13533 100644
--- a/src/equicordplugins/questCompleter.discordDesktop/index.tsx
+++ b/src/equicordplugins/questCompleter.discordDesktop/index.tsx
@@ -221,8 +221,8 @@ export default definePlugin({
         {
             find: "AppTitleBar",
             replacement: {
-                match: /(?<=trailing:.{0,70}\(\i\.Fragment,{children:\[.*?)\]/,
-                replace: ",$self.renderQuestButton()]"
+                match: /(?<=trailing:.{0,70}\(\i\.Fragment,{children:\[)/,
+                replace: "$self.renderQuestButton(),"
             }
         }
     ],