From 22a755b25d300c974c9477208d0fb2353e34e10d Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Wed, 25 Sep 2024 17:10:47 -0400
Subject: [PATCH] Fix Channel Tabs

---
 .../channelTabs/components/BookmarkContainer.tsx           | 5 +++--
 .../channelTabs/components/ContextMenus.tsx                | 7 ++++---
 src/equicordplugins/channelTabs/index.tsx                  | 3 +++
 src/webpack/common/utils.ts                                | 4 ----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/equicordplugins/channelTabs/components/BookmarkContainer.tsx b/src/equicordplugins/channelTabs/components/BookmarkContainer.tsx
index 4cc2ae7c..8c97d9d2 100644
--- a/src/equicordplugins/channelTabs/components/BookmarkContainer.tsx
+++ b/src/equicordplugins/channelTabs/components/BookmarkContainer.tsx
@@ -8,8 +8,9 @@ import { classNameFactory } from "@api/Styles";
 import { classes } from "@utils/misc";
 import { closeModal, openModal } from "@utils/modal";
 import { findByPropsLazy } from "@webpack";
-import { Avatar, ChannelStore, ContextMenuApi, FluxDispatcher, GuildStore, i18n, Menu, ReadStateStore, ReadStateUtils, Text, Tooltip, useDrag, useDrop, useEffect, useRef, UserStore } from "@webpack/common";
+import { Avatar, ChannelStore, ContextMenuApi, FluxDispatcher, GuildStore, i18n, Menu, ReadStateStore, Text, Tooltip, useDrag, useDrop, useEffect, useRef, UserStore } from "@webpack/common";
 
+import { ackChannel } from "..";
 import { BasicChannelTabsProps, Bookmark, BookmarkFolder, BookmarkProps, CircleQuestionIcon, isBookmarkFolder, settings, switchChannel, useBookmarks } from "../util";
 import { NotificationDot } from "./ChannelTab";
 import { BookmarkContextMenu, EditModal } from "./ContextMenus";
@@ -110,7 +111,7 @@ function BookmarkFolderOpenMenu(props: BookmarkProps) {
                                 id="mark-as-read"
                                 label={i18n.Messages.MARK_AS_READ}
                                 disabled={!ReadStateStore.hasUnread(b.channelId)}
-                                action={() => ReadStateUtils.ackChannel(ChannelStore.getChannel(b.channelId))}
+                                action={() => ackChannel(ChannelStore.getChannel(b.channelId))}
                             />
                         </Menu.MenuGroup>
                     ),
diff --git a/src/equicordplugins/channelTabs/components/ContextMenus.tsx b/src/equicordplugins/channelTabs/components/ContextMenus.tsx
index 38a74a62..a3d3d410 100644
--- a/src/equicordplugins/channelTabs/components/ContextMenus.tsx
+++ b/src/equicordplugins/channelTabs/components/ContextMenus.tsx
@@ -6,8 +6,9 @@
 
 import { Margins } from "@utils/margins";
 import { closeModal, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
-import { Button, ChannelStore, FluxDispatcher, Forms, i18n, Menu, ReadStateStore, ReadStateUtils, Select, Text, TextInput, useState } from "@webpack/common";
+import { Button, ChannelStore, FluxDispatcher, Forms, i18n, Menu, ReadStateStore, Select, Text, TextInput, useState } from "@webpack/common";
 
+import { ackChannel } from "..";
 import { bookmarkFolderColors, bookmarkPlaceholderName, closeOtherTabs, closeTab, closeTabsToTheLeft, closeTabsToTheRight, createTab, hasClosedTabs, isBookmarkFolder, openedTabs, reopenClosedTab, settings, toggleCompactTab } from "../util";
 import { Bookmark, BookmarkFolder, Bookmarks, ChannelTabsProps, UseBookmarkMethods } from "../util/types";
 
@@ -179,7 +180,7 @@ export function BookmarkContextMenu({ bookmarks, index, methods }: { bookmarks:
                         id="mark-as-read"
                         label={i18n.Messages.MARK_AS_READ}
                         disabled={!ReadStateStore.hasUnread(bookmark.channelId)}
-                        action={() => ReadStateUtils.ackChannel(ChannelStore.getChannel(bookmark.channelId))}
+                        action={() => ackChannel(ChannelStore.getChannel(bookmark.channelId))}
                     />
                 }
                 {isFolder
@@ -289,7 +290,7 @@ export function TabContextMenu({ tab }: { tab: ChannelTabsProps; }) {
                         id="mark-as-read"
                         label={i18n.Messages.MARK_AS_READ}
                         disabled={!ReadStateStore.hasUnread(channel.id)}
-                        action={() => ReadStateUtils.ackChannel(channel)}
+                        action={() => ackChannel(channel)}
                     />
                 }
                 <Menu.MenuCheckboxItem
diff --git a/src/equicordplugins/channelTabs/index.tsx b/src/equicordplugins/channelTabs/index.tsx
index 0743fb3c..76dfd9b4 100644
--- a/src/equicordplugins/channelTabs/index.tsx
+++ b/src/equicordplugins/channelTabs/index.tsx
@@ -10,6 +10,7 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/Co
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs, EquicordDevs } from "@utils/constants";
 import definePlugin from "@utils/types";
+import { findByCodeLazy } from "@webpack";
 import { ChannelStore, Menu } from "@webpack/common";
 import { Channel, Message } from "discord-types/general";
 
@@ -17,6 +18,8 @@ import ChannelsTabsContainer from "./components/ChannelTabsContainer";
 import { BasicChannelTabsProps, createTab, settings } from "./util";
 import * as ChannelTabsUtils from "./util";
 
+export const ackChannel = findByCodeLazy(".getActiveJoinedThreadsForParent(", "isForumLikeChannel()");
+
 const contextMenuPatch: NavContextMenuPatchCallback = (children, props: { channel: Channel, messageId?: string; }) =>
     () => {
         const { channel, messageId } = props;
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 5ce401b2..eb589f22 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -172,10 +172,6 @@ export const InviteActions = findByPropsLazy("resolveInvite");
 
 export const IconUtils: t.IconUtils = findByPropsLazy("getGuildBannerURL", "getUserAvatarURL");
 
-export const ReadStateUtils = mapMangledModuleLazy('type:"ENABLE_AUTOMATIC_ACK",', {
-    ackChannel: filters.byCode(".getActiveJoinedThreadsForParent(")
-});
-
 export const ExpressionPickerStore: t.ExpressionPickerStore = mapMangledModuleLazy("expression-picker-last-active-view", {
     openExpressionPicker: filters.byCode(/setState\({activeView:(?:(?!null)\i),activeViewType:/),
     closeExpressionPicker: filters.byCode("setState({activeView:null"),