From 85598ddf9bed9c644df0bdd3d069b0ad5194e09b Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 7 Feb 2025 02:43:27 -0500
Subject: [PATCH] Mostly Fix AllCallTimers

---
 .../VencordSettings/SpecialCard.tsx           |  1 -
 .../VencordSettings/specialCard.css           |  1 -
 src/equicordplugins/allCallTimers/index.tsx   | 33 +++----------------
 src/plugins/roleColorEverywhere/index.tsx     |  6 ++--
 4 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/src/components/VencordSettings/SpecialCard.tsx b/src/components/VencordSettings/SpecialCard.tsx
index 6fd952f4..9098d9bc 100644
--- a/src/components/VencordSettings/SpecialCard.tsx
+++ b/src/components/VencordSettings/SpecialCard.tsx
@@ -64,7 +64,6 @@ export function SpecialCard({ title, subtitle, description, cardImage, backgroun
             </div>
             {buttonTitle && (
                 <>
-                    <Forms.FormDivider className={cl("seperator")} />
                     <Clickable onClick={onClick} className={cl("hyperlink")}>
                         <Forms.FormText className={cl("hyperlink-text")}>
                             {buttonTitle}
diff --git a/src/components/VencordSettings/specialCard.css b/src/components/VencordSettings/specialCard.css
index 07b628f5..e0755891 100644
--- a/src/components/VencordSettings/specialCard.css
+++ b/src/components/VencordSettings/specialCard.css
@@ -84,7 +84,6 @@
     width: 100px;
     height: 100px;
     border-radius: 50%;
-    background-color: white;
 }
 
 .vc-special-image {
diff --git a/src/equicordplugins/allCallTimers/index.tsx b/src/equicordplugins/allCallTimers/index.tsx
index 88d83b4e..8ef7cec2 100644
--- a/src/equicordplugins/allCallTimers/index.tsx
+++ b/src/equicordplugins/allCallTimers/index.tsx
@@ -105,20 +105,11 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: "renderPrioritySpeaker",
+            find: ".usernameSpeaking]",
             replacement: [
                 {
-                    match: /(render\(\)\{.+\}\),children:)\[(.+renderName\(\),)/,
-                    replace: "$&,$self.showClockInjection(this),"
-                }
-            ]
-        },
-        {
-            find: "renderPrioritySpeaker",
-            replacement: [
-                {
-                    match: /(renderName\(\)\{.+:"")/,
-                    replace: "$&,$self.showTextInjection(this),"
+                    match: /function\(\)\{.+:""(?=.*?userId:(\i))/,
+                    replace: "$&,$self.renderTimer($1.id),"
                 }
             ]
         }
@@ -225,26 +216,10 @@ export default definePlugin({
         }
     },
 
-    showClockInjection(property: { props: { user: { id: string; }; }; }) {
-        if (settings.store.showWithoutHover) {
-            return "";
-        }
-        return this.showInjection(property);
-    },
-
-    showTextInjection(property: { props: { user: { id: string; }; }; }) {
+    renderTimer(userId: string) {
         if (!settings.store.showWithoutHover) {
             return "";
         }
-        return this.showInjection(property);
-    },
-
-    showInjection(property: { props: { user: { id: string; }; }; }) {
-        const userId = property.props.user.id;
-        return this.renderTimer(userId);
-    },
-
-    renderTimer(userId: string) {
         // get the user join time from the users object
         const joinTime = userJoinTimes.get(userId);
         if (!joinTime?.time) {
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 7b811943..0a54ba24 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -124,11 +124,11 @@ export default definePlugin({
         },
         // Voice Users
         {
-            find: "renderPrioritySpeaker(){",
+            find: ".usernameSpeaking]",
             replacement: [
                 {
-                    match: /renderName\(\){.+?usernameSpeaking\]:.+?(?=children)/,
-                    replace: "$&style:$self.getColorStyle(this?.props?.user?.id,this?.props?.guildId),"
+                    match: /usernameSpeaking\]:.+?(?=children)(?=.*?userId:(\i))(?=.*?contextGuildId:(\i))/,
+                    replace: "$&style:$self.getColorStyle($1.id,$2),"
                 }
             ],
             predicate: () => settings.store.voiceUsers