From d2a0324647200ad6579df04916303432ee3892c0 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sun, 4 May 2025 00:21:12 -0400
Subject: [PATCH] Fix MoreUserTags Settings

---
 src/components/PluginSettings/PluginModal.tsx | 12 +--
 src/equicordplugins/moreUserTags/settings.tsx | 98 ++++++++++++-------
 .../components/NotificationComponent.tsx      |  6 +-
 3 files changed, 67 insertions(+), 49 deletions(-)

diff --git a/src/components/PluginSettings/PluginModal.tsx b/src/components/PluginSettings/PluginModal.tsx
index fa11674b..69a2273f 100644
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@@ -179,20 +179,18 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
         }
     }
 
-    function renderMoreUsers(_label: string, count: number) {
-        const sliceCount = plugin.authors.length - count;
-        const sliceStart = plugin.authors.length - sliceCount;
-        const sliceEnd = sliceStart + plugin.authors.length - count;
+    function renderMoreUsers(_label: string) {
+        const remainingAuthors = plugin.authors.slice(6);
 
         return (
-            <Tooltip text={plugin.authors.slice(sliceStart, sliceEnd).map(u => u.name).join(", ")}>
+            <Tooltip text={remainingAuthors.map(u => u.name).join(", ")}>
                 {({ onMouseEnter, onMouseLeave }) => (
                     <div
                         className={AvatarStyles.moreUsers}
                         onMouseEnter={onMouseEnter}
                         onMouseLeave={onMouseLeave}
                     >
-                        +{sliceCount}
+                        +{remainingAuthors.length}
                     </div>
                 )}
             </Tooltip>
@@ -252,7 +250,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                             renderIcon={false}
                             showDefaultAvatarsForNullUsers
                             showUserPopout
-                            renderMoreUsers={plugin.authors.length > 6 ? renderMoreUsers : undefined}
+                            renderMoreUsers={renderMoreUsers}
                             renderUser={(user: User) => (
                                 <Clickable
                                     className={AvatarStyles.clickableAvatar}
diff --git a/src/equicordplugins/moreUserTags/settings.tsx b/src/equicordplugins/moreUserTags/settings.tsx
index df006ef8..e3853571 100644
--- a/src/equicordplugins/moreUserTags/settings.tsx
+++ b/src/equicordplugins/moreUserTags/settings.tsx
@@ -18,46 +18,68 @@ function SettingsComponent() {
 
     return (
         <Flex flexDirection="column">
-            {tags.map(t => (
-                <Card key={t.name} style={{ padding: "1em 1em 0" }}>
-                    <Forms.FormTitle style={{ width: "fit-content" }}>
-                        <Tooltip text={t.description}>
-                            {({ onMouseEnter, onMouseLeave }) => (
-                                <div
-                                    onMouseEnter={onMouseEnter}
-                                    onMouseLeave={onMouseLeave}
-                                >
-                                    {t.displayName} Tag <Tag type={localTags[t.name]}></Tag>
-                                </div>
-                            )}
-                        </Tooltip>
-                    </Forms.FormTitle>
-
-                    <TextInput
-                        type="text"
-                        value={tagSettings[t.name]?.text ?? t.displayName}
-                        placeholder={`Text on tag (default: ${t.displayName})`}
-                        onChange={v => tagSettings[t.name].text = v}
-                        className={Margins.bottom16}
-                    />
-
-                    <Switch
-                        value={tagSettings[t.name]?.showInChat ?? true}
-                        onChange={v => tagSettings[t.name].showInChat = v}
-                        hideBorder
+            <div
+                style={{
+                    display: "flex",
+                    flexWrap: "wrap",
+                    gap: "16px",
+                }}
+            >
+                {tags.map(t => (
+                    <Card
+                        key={t.name}
+                        style={{
+                            padding: "1em 1em 0",
+                            width: "calc(33.333% - 11px)",
+                            boxSizing: "border-box",
+                        }}
                     >
-                        Show in messages
-                    </Switch>
+                        <Forms.FormTitle style={{ width: "fit-content" }}>
+                            <Tooltip text={t.description}>
+                                {({ onMouseEnter, onMouseLeave }) => (
+                                    <div
+                                        onMouseEnter={onMouseEnter}
+                                        onMouseLeave={onMouseLeave}
+                                    >
+                                        {t.displayName} Tag
+                                    </div>
+                                )}
+                            </Tooltip>
+                        </Forms.FormTitle>
 
-                    <Switch
-                        value={tagSettings[t.name]?.showInNotChat ?? true}
-                        onChange={v => tagSettings[t.name].showInNotChat = v}
-                        hideBorder
-                    >
-                        Show in member list and profiles
-                    </Switch>
-                </Card>
-            ))}
+                        <div style={{ marginBottom: "10px" }}>
+                            <Forms.FormText style={{ fontSize: "13px" }}>
+                                Example:
+                            </Forms.FormText>
+                            <Tag type={localTags[t.name]} />
+                        </div>
+
+                        <TextInput
+                            type="text"
+                            value={tagSettings[t.name]?.text ?? t.displayName}
+                            placeholder={`Text on tag (default: ${t.displayName})`}
+                            onChange={v => tagSettings[t.name].text = v}
+                            className={Margins.bottom16}
+                        />
+
+                        <Switch
+                            value={tagSettings[t.name]?.showInChat ?? true}
+                            onChange={v => tagSettings[t.name].showInChat = v}
+                            hideBorder
+                        >
+                            Show in messages
+                        </Switch>
+
+                        <Switch
+                            value={tagSettings[t.name]?.showInNotChat ?? true}
+                            onChange={v => tagSettings[t.name].showInNotChat = v}
+                            hideBorder
+                        >
+                            Show in member list and profiles
+                        </Switch>
+                    </Card>
+                ))}
+            </div>
         </Flex>
     );
 }
diff --git a/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx b/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
index 0f6adb75..207d99bb 100644
--- a/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
+++ b/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
@@ -44,11 +44,9 @@ export default ErrorBoundary.wrap(function NotificationComponent({
     let renderBody: boolean = true;
     let footer: boolean = false;
 
-    if (attachments > 0)
-        footer = true;
+    if (attachments > 0) footer = true;
 
-    if (body === "")
-        renderBody = false;
+    if (body === "") renderBody = false;
 
     // Precompute appearance settings.
     const AppearanceSettings = {