From 7e2b8c19049406a1b3dd52a9cc192bf76b6922fb Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sat, 14 Jun 2025 13:05:15 -0400
Subject: [PATCH] CustomUserColors: Fix Some Readability

---
 src/equicordplugins/customUserColors/index.tsx |  1 +
 src/main/utils/extensions.ts                   |  3 ++-
 src/plugins/ircColors/index.ts                 | 17 +++++++++++------
 src/plugins/roleColorEverywhere/index.tsx      |  6 ++++--
 src/plugins/typingTweaks/index.tsx             | 11 ++++++++---
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/equicordplugins/customUserColors/index.tsx b/src/equicordplugins/customUserColors/index.tsx
index ad7e3567..f77749e5 100644
--- a/src/equicordplugins/customUserColors/index.tsx
+++ b/src/equicordplugins/customUserColors/index.tsx
@@ -62,6 +62,7 @@ const userContextMenuPatch: NavContextMenuPatchCallback = (children, { user }: {
 };
 
 export function getCustomColorString(userId: string, withHash?: boolean): string | undefined {
+    if (!userId) return;
     if (!colors[userId] || !Settings.plugins.CustomUserColors.enabled) return;
     if (withHash) return `#${colors[userId]}`;
     return colors[userId];
diff --git a/src/main/utils/extensions.ts b/src/main/utils/extensions.ts
index b48eb33d..9ecfbfe8 100644
--- a/src/main/utils/extensions.ts
+++ b/src/main/utils/extensions.ts
@@ -79,5 +79,6 @@ export async function installExt(id: string) {
             .catch(err => console.error(`Failed to extract extension ${id}`, err));
     }
 
-    session.defaultSession.loadExtension(extDir);
+    // @ts-expect-error Electron 36 Deprecates session.defaultSession.loadExtension()
+    session.defaultSession.extensions ? session.defaultSession.extensions.loadExtension(extDir) : session.defaultSession.loadExtension(extDir);
 }
diff --git a/src/plugins/ircColors/index.ts b/src/plugins/ircColors/index.ts
index 500302c9..4f71e228 100644
--- a/src/plugins/ircColors/index.ts
+++ b/src/plugins/ircColors/index.ts
@@ -109,13 +109,18 @@ export default definePlugin({
         const id = context?.user?.id;
         const colorString = context?.colorString;
         const color = calculateNameColorForUser(id);
-        const customColor = id && Settings.plugins.CustomUserColors.enabled ? getCustomColorString(id, true) : null;
 
-        if (
-            (settings.store.applyColorOnlyInDms && !context?.channel?.isPrivate()) ||
-            (settings.store.applyColorOnlyToUsersWithoutColor && colorString)
-        ) return customColor ?? colorString;
+        if (Settings.plugins.CustomUserColors.enabled) {
+            const customColor = getCustomColorString(id, true);
+            if (customColor) return customColor;
+        }
 
-        return customColor ?? color;
+        if (settings.store.applyColorOnlyInDms && !context?.channel?.isPrivate()) {
+            return colorString;
+        }
+
+        return (!settings.store.applyColorOnlyToUsersWithoutColor || !colorString)
+            ? color
+            : colorString;
     }
 });
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 7b2d5714..daafc994 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -165,8 +165,10 @@ export default definePlugin({
 
     getColorString(userId: string, channelOrGuildId: string) {
         try {
-            if (Settings.plugins.CustomUserColors.enabled)
-                return getCustomColorString(userId, true);
+            if (Settings.plugins.CustomUserColors.enabled) {
+                const customColor = getCustomColorString(userId, true);
+                if (customColor) return customColor;
+            }
 
             const guildId = ChannelStore.getChannel(channelOrGuildId)?.guild_id ?? GuildStore.getGuild(channelOrGuildId)?.id;
             if (guildId == null) return null;
diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index d556480a..7aeb58b2 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -60,10 +60,15 @@ interface Props {
     guildId: string;
 }
 
-function typingUserColor(guildId: string, userId: string) {
+function typingUserColor(guildId: string, userId: string): string | undefined {
     if (!settings.store.showRoleColors) return;
-    const customColor = Settings.plugins.CustomUserColors.enabled ? getCustomColorString(userId, true) : null;
-    return customColor ?? GuildMemberStore.getMember(guildId, userId)?.colorString;
+
+    if (Settings.plugins.CustomUserColors.enabled) {
+        const customColor = getCustomColorString(userId, true);
+        if (customColor) return customColor;
+    }
+
+    return GuildMemberStore.getMember(guildId, userId)?.colorString;
 }
 
 const TypingUser = ErrorBoundary.wrap(function ({ user, guildId }: Props) {