From 46f4e74b5dde4db72da92d06e9f4fbc914e04e01 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 4 Jul 2025 10:22:33 -0400
Subject: [PATCH] Misc: Update Plugin Functions

---
 .../components/BookmarkContainer.tsx          |  4 +-
 .../channelTabs/components/ChannelTab.tsx     |  4 +-
 .../components/HiddenServersMenu.tsx          | 38 +++++++++----------
 src/equicordplugins/hideServers/settings.tsx  |  2 +-
 src/plugins/serverInfo/GuildInfoModal.tsx     |  2 +-
 5 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/equicordplugins/channelTabs/components/BookmarkContainer.tsx b/src/equicordplugins/channelTabs/components/BookmarkContainer.tsx
index 8c97f625e..7e3b2ee8d 100644
--- a/src/equicordplugins/channelTabs/components/BookmarkContainer.tsx
+++ b/src/equicordplugins/channelTabs/components/BookmarkContainer.tsx
@@ -5,7 +5,7 @@
  */
 
 import { classNameFactory } from "@api/Styles";
-import { getIntlMessage } from "@utils/discord";
+import { getGuildAcronym, getIntlMessage } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { closeModal, openModal } from "@utils/modal";
 import { findComponentByCodeLazy } from "@webpack";
@@ -47,7 +47,7 @@ function BookmarkIcon({ bookmark }: { bookmark: Bookmark | BookmarkFolder; }) {
             className={cl("bookmark-icon")}
         />
         : <div className={cl("bookmark-icon")}>
-            <Text variant="text-xxs/semibold" tag="span">{guild.acronym}</Text>
+            <Text variant="text-xxs/semibold" tag="span">{getGuildAcronym(guild)}</Text>
         </div>;
 
     if (channel?.recipients?.length) {
diff --git a/src/equicordplugins/channelTabs/components/ChannelTab.tsx b/src/equicordplugins/channelTabs/components/ChannelTab.tsx
index f8350ef4f..2ce99b87e 100644
--- a/src/equicordplugins/channelTabs/components/ChannelTab.tsx
+++ b/src/equicordplugins/channelTabs/components/ChannelTab.tsx
@@ -5,7 +5,7 @@
  */
 
 import { classNameFactory } from "@api/Styles";
-import { getIntlMessage, getUniqueUsername } from "@utils/discord";
+import { getGuildAcronym, getIntlMessage, getUniqueUsername } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { Avatar, ChannelStore, ContextMenuApi, GuildStore, PresenceStore, ReadStateStore, Text, TypingStore, useDrag, useDrop, useRef, UserStore, useStateFromStores } from "@webpack/common";
@@ -37,7 +37,7 @@ const GuildIcon = ({ guild }: { guild: Guild; }) => {
             className={cl("icon")}
         />
         : <div className={cl("guild-acronym-icon")}>
-            <Text variant="text-xs/semibold" tag="span">{guild.acronym}</Text>
+            <Text variant="text-xs/semibold" tag="span">{getGuildAcronym(guild)}</Text>
         </div>;
 };
 
diff --git a/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx b/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx
index 2673e1d40..cd67e6f3a 100644
--- a/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx
+++ b/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx
@@ -5,6 +5,7 @@
  */
 
 import { classNameFactory } from "@api/Styles";
+import { getGuildAcronym } from "@utils/discord";
 import { classes } from "@utils/misc";
 import {
     closeModal,
@@ -25,14 +26,8 @@ import { HiddenServersStore } from "../HiddenServersStore";
 const cl = classNameFactory("vc-hideservers-");
 const IconClasses = findByPropsLazy("icon", "acronym", "childWrapper");
 
-function HiddenServersModal({
-    modalProps,
-    close,
-}: {
-    modalProps: ModalProps;
-    close(): void;
-}) {
-    const servers = useStateFromStores([HiddenServersStore], () => HiddenServersStore.hiddenGuildsDetail());
+function HiddenServersModal({ modalProps, close }: { modalProps: ModalProps; close(): void; }) {
+    const guilds = useStateFromStores([HiddenServersStore], () => HiddenServersStore.hiddenGuildsDetail());
     return (
         <ModalRoot {...modalProps} size={ModalSize.LARGE}>
             <ModalHeader>
@@ -43,23 +38,26 @@ function HiddenServersModal({
             </ModalHeader>
 
             <ModalContent>
-                <HiddenServersMenu servers={servers} />
+                <HiddenServersMenu guilds={guilds} />
             </ModalContent>
         </ModalRoot>
     );
 }
 
-export function HiddenServersMenu({ servers }: { servers: Guild[]; }) {
+export function HiddenServersMenu({ guilds }: { guilds: Guild[]; }) {
     return <div className={cl("list")}>
-        {servers.length > 0 ? (
-            servers.map(server => (
-                <div key={server.id} className={cl("row")}>
+        {guilds.length > 0 ? (
+            guilds.map(guild => (
+                <div key={guild.id} className={cl("row")}>
                     <div className={cl("guildicon")}>
-                        {server.icon
-                            ? <img height="48" width="48"
+                        {guild.icon
+                            ? <img
+                                alt=""
+                                height="48"
+                                width="48"
                                 src={IconUtils.getGuildIconURL({
-                                    id: server.id,
-                                    icon: server.icon,
+                                    id: guild.id,
+                                    icon: guild.icon,
                                     canAnimate: true,
                                     size: 240,
                                 })} />
@@ -69,17 +67,17 @@ export function HiddenServersMenu({ servers }: { servers: Guild[]; }) {
                                     IconClasses.childWrapper,
                                     IconClasses.acronym
                                 )}>
-                                {server.acronym}
+                                {getGuildAcronym(guild)}
                             </div>
                         }
                     </div>
                     <Forms.FormTitle className={cl("name")}>
-                        {server.name}
+                        {guild.name}
                     </Forms.FormTitle>
                     <Button
                         className={"row-button"}
                         color={Button.Colors.PRIMARY}
-                        onClick={() => HiddenServersStore.removeHidden(server.id)}
+                        onClick={() => HiddenServersStore.removeHidden(guild.id)}
                     >
                         Remove
                     </Button>
diff --git a/src/equicordplugins/hideServers/settings.tsx b/src/equicordplugins/hideServers/settings.tsx
index 1f6848247..3ea989b7b 100644
--- a/src/equicordplugins/hideServers/settings.tsx
+++ b/src/equicordplugins/hideServers/settings.tsx
@@ -30,7 +30,7 @@ export default definePluginSettings({
         description: "Remove hidden servers",
         component: () => {
             const detail = useStateFromStores([HiddenServersStore], () => HiddenServersStore.hiddenGuildsDetail());
-            return <HiddenServersMenu servers={detail} />;
+            return <HiddenServersMenu guilds={detail} />;
         }
     },
     resetHidden: {
diff --git a/src/plugins/serverInfo/GuildInfoModal.tsx b/src/plugins/serverInfo/GuildInfoModal.tsx
index dee2cffb8..e554a5aad 100644
--- a/src/plugins/serverInfo/GuildInfoModal.tsx
+++ b/src/plugins/serverInfo/GuildInfoModal.tsx
@@ -374,7 +374,7 @@ function MutualServerIcons({ member }: { member: MemberWithMutuals; }) {
                     {iconUrl ? (
                         <img src={iconUrl} alt="" />
                     ) : (
-                        <div className={cl("guild-acronym")}>{guild.acronym}</div>
+                        <div className={cl("guild-acronym")}>{getGuildAcronym(guild)}</div>
                     )}
                 </div>
             ))}