From fc30e05414de3ac6bbb46f5d55ee109a25c84bd0 Mon Sep 17 00:00:00 2001
From: sadan <117494111+sadan4@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:50:06 -0500
Subject: [PATCH] cleanup

---
 src/plugins/roleColorEverywhere/color.ts  | 22 ++++------------------
 src/plugins/roleColorEverywhere/index.tsx |  8 +++++---
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/plugins/roleColorEverywhere/color.ts b/src/plugins/roleColorEverywhere/color.ts
index 9abad3853..942fe2f22 100644
--- a/src/plugins/roleColorEverywhere/color.ts
+++ b/src/plugins/roleColorEverywhere/color.ts
@@ -9,9 +9,8 @@ const clamp = (min: number, max: number) => (num: number) =>
 const clampContrast = clamp(1, 21);
 const snap = (mult: number, num: number) =>
     Math.floor((num % mult) / (mult / 2)) * mult + (num - (num % mult));
-/**
- * 0-1
- */
+
+// NOTE: All color values are 0-1 and multiplied when stringified
 interface sRGB {
     type: "srgb";
     r: number;
@@ -27,13 +26,7 @@ interface lRGB {
 interface HSL {
     type: "hsl";
     h: number;
-    /**
-     * 0-1
-     */
     s: number;
-    /**
-     * 0-1
-     */
     l: number;
 }
 interface OKLAB {
@@ -42,8 +35,9 @@ interface OKLAB {
     a: number;
     b: number;
 }
-type AnyColor = sRGB | lRGB | HSL | OKLAB;
+
 const RGB_REGEX = /rgb\((?:(\d+(?:\.\d+)?),? ?)(?:(\d+(?:\.\d+)?),? ?)(?:(\d+(?:\.\d+)?),? ?)\)/;
+
 export class Color {
     private sRGB: sRGB;
     private get lRGB(): lRGB {
@@ -122,10 +116,6 @@ export class Color {
         return `rgb(${this.sRGB.r * 255}, ${this.sRGB.g * 255}, ${this.sRGB.b * 255})`;
     }
 
-    public get hslString(): string {
-        return `hsl(${this.HSL.h}, ${(this.HSL.s * 100).toFixed(1)}%, ${(this.HSL.l * 100).toFixed(1)}%)`;
-    }
-
     public get lightness(): number {
         return this.HSL.l;
     }
@@ -173,10 +163,6 @@ export class Color {
         return (fg.lumin + 0.05) / (bg.lumin + 0.05);
     }
 
-    public static mixokl(c1: string, c2: string, pc1: number): Color {
-        return Color.parse(c1).mix("oklab", pc1 / 100, Color.parse(c2));
-    }
-
     public mix(colorspace: "oklab", thisPercent: number, other: Color, otherPercent = 1 - thisPercent): Color {
         switch (colorspace) {
             case "oklab": {
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index aab4b8545..6d17e50ef 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -265,10 +265,12 @@ export default definePlugin({
                         throw new Error("No background color found");
                     }
                     const bg = new Contrast(Color.parse(bgOverlayChat || backgroundPrimary));
+                    const rc = Color.parse(author.colorString);
+                    const mkColor = c => bg.calculateMinContrastColor(rc.mix("oklab", messageSaturation / 100, Color.parse(c)), contrast);
                     return {
-                        color: bg.calculateMinContrastColor(Color.mixokl(author.colorString, textNormal, messageSaturation), contrast),
-                        "--header-primary": bg.calculateMinContrastColor(Color.mixokl(author.colorString, headerPrimary, messageSaturation), contrast),
-                        "--text-muted": bg.calculateMinContrastColor(Color.mixokl(author.colorString, textMuted, messageSaturation), contrast)
+                        color: mkColor(textNormal),
+                        "--header-primary": mkColor(headerPrimary),
+                        "--text-muted": mkColor(textMuted)
                     };
                 }
             } catch (e) {