From dfd8d1b0c90fd3f86f0834fc374ab84cd8a01184 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sat, 2 Mar 2024 19:55:52 -0500
Subject: [PATCH] [-] Remove the unnecessary clz shorthand

---
 AquaNet/src/components/StatusOverlays.svelte |  3 +--
 AquaNet/src/libs/ui.ts                       | 14 +-------------
 AquaNet/src/pages/Home/LinkCard.svelte       |  7 +++----
 AquaNet/src/pages/Ranking.svelte             |  4 ++--
 AquaNet/src/pages/UserHome.svelte            |  6 +++---
 5 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/AquaNet/src/components/StatusOverlays.svelte b/AquaNet/src/components/StatusOverlays.svelte
index 3ee1d1d3..c324bbec 100644
--- a/AquaNet/src/components/StatusOverlays.svelte
+++ b/AquaNet/src/components/StatusOverlays.svelte
@@ -2,7 +2,6 @@
 
 <script lang="ts">
   import { fade } from 'svelte/transition'
-  import { clz } from "../libs/ui";
   import type { ConfirmProps } from "../libs/generalTypes";
   import { DISCORD_INVITE } from "../libs/config";
   import Icon from "@iconify/svelte";
@@ -29,7 +28,7 @@
             confirm = null
           }}>Cancel</button>
         {/if}
-        <button on:click={() => confirm && confirm.confirm()} class={clz({error: confirm.dangerous})}>Confirm</button>
+        <button on:click={() => confirm && confirm.confirm()} class:error={confirm.dangerous}>Confirm</button>
       </div>
     </div>
   </div>
diff --git a/AquaNet/src/libs/ui.ts b/AquaNet/src/libs/ui.ts
index 99a2653e..50846d0c 100644
--- a/AquaNet/src/libs/ui.ts
+++ b/AquaNet/src/libs/ui.ts
@@ -88,16 +88,4 @@ export const CHARTJS_OPT: ChartOptions<'line'> = {
       intersect: false
     }
   },
-}
-
-/**
- * Convert object keys to classes depending on their values
- *
- * @param obj Dictionary object {classname: truthy}
- * @param others Other classes to add
- */
-export function clz(obj: any, others?: string) {
-  let cls = Object.keys(obj).filter(key => obj[key]).join(' ')
-  if (others) cls += ' ' + others
-  return cls
-}
+}
\ No newline at end of file
diff --git a/AquaNet/src/pages/Home/LinkCard.svelte b/AquaNet/src/pages/Home/LinkCard.svelte
index 39ac0174..acab3e0d 100644
--- a/AquaNet/src/pages/Home/LinkCard.svelte
+++ b/AquaNet/src/pages/Home/LinkCard.svelte
@@ -2,7 +2,6 @@
 
 <script lang="ts">
   import { slide, fade } from "svelte/transition"
-  import { clz } from "../../libs/ui";
   import type { Card, CardSummary, CardSummaryGame, ConfirmProps, UserMe } from "../../libs/generalTypes";
   import { CARD, USER } from "../../libs/sdk";
   import moment from "moment"
@@ -218,7 +217,7 @@
   {#if me}
     <div class="existing-cards" transition:slide>
       {#each me.cards as card (card.luid)}
-        <div class={clz({ghost: card.ghost}, 'existing card')} transition:fade|global>
+        <div class:ghost={card.ghost} class='existing card' transition:fade|global>
           <span class="type">{card.ghost ? "Account Card" : cardType(card.luid)}</span>
           <span class="register">Registered: {moment(card.registerTime).format("YYYY MMM DD")}</span>
           <span class="last">Last used: {moment(card.accessTime).format("YYYY MMM DD")}</span>
@@ -245,7 +244,7 @@
            }}
            bind:value={inputAC}
            on:input={inputACChange}
-           class={clz({error: (inputAC && (!inputACRegex.test(inputAC) || errorAC))})}>
+           class:error={inputAC && (!inputACRegex.test(inputAC) || errorAC)}>
     {#if inputAC.length > 0}
       <button transition:slide={{axis: 'x'}} on:click={() => link('AC')}>Link</button>
     {/if}
@@ -268,7 +267,7 @@
            }}
            bind:value={inputSN}
            on:input={inputSNChange}
-           class={clz({error: (inputSN && (!inputSNRegex.test(inputSN) || errorSN))})}>
+           class:error={inputSN && (!inputSNRegex.test(inputSN) || errorSN)}>
     {#if inputSN.length > 0}
       <button transition:slide={{axis: 'x'}} on:click={() => link('SN')}>Link</button>
     {/if}
diff --git a/AquaNet/src/pages/Ranking.svelte b/AquaNet/src/pages/Ranking.svelte
index 365bca8d..eba3ce2a 100644
--- a/AquaNet/src/pages/Ranking.svelte
+++ b/AquaNet/src/pages/Ranking.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { clz, title } from "../libs/ui";
+  import { title } from "../libs/ui";
   import { GAME } from "../libs/sdk";
   import type { GenericRanking } from "../libs/generalTypes";
   import StatusOverlays from "../components/StatusOverlays.svelte";
@@ -30,7 +30,7 @@
         <span class="ap">AP</span>
       </div>
       {#each d.users as user, i (user.rank)}
-        <div class={clz({ alternate: i % 2 === 1 }, "lb-user")}>
+        <div class="lb-user" class:alternate={i % 2 === 1}>
           <span class="rank">#{user.rank}</span>
           {#if user.username !== ""}
           <a class="name" href="/u/{user.username}">{user.name}</a>
diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte
index 4a44df11..f8362d94 100644
--- a/AquaNet/src/pages/UserHome.svelte
+++ b/AquaNet/src/pages/UserHome.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {CHARTJS_OPT, clz, registerChart, renderCal, title} from "../libs/ui";
+  import {CHARTJS_OPT, registerChart, renderCal, title} from "../libs/ui";
   import type { GenericGamePlaylog, GenericGameSummary, MusicMeta, TrendEntry } from "../libs/generalTypes";
   import {DATA_HOST} from "../libs/config";
   import 'cal-heatmap/cal-heatmap.css';
@@ -168,7 +168,7 @@
       <h2>Recent Scores</h2>
       <div class="scores">
         {#each d.recent as r, i}
-          <div class={clz({alt: i % 2 === 0})}>
+          <div class:alt={i % 2 === 0}>
             <img src={`${DATA_HOST}/d/${game}/music/00${r.musicId.toString().padStart(6, '0').substring(2)}.png`} alt=""
                   on:error={coverNotFound} />
             <div class="info">
@@ -182,7 +182,7 @@
                   <span class="rank-num">{(r.achievement / 10000).toFixed(2)}%</span>
                 </span>
                 {#if game === 'mai2'}
-                  <span class={"dx-change " + clz({increased: r.afterRating - r.beforeRating > 0})}>
+                  <span class:increased={r.afterRating - r.beforeRating > 0} class="dx-change">
                     {r.afterRating - r.beforeRating}
                   </span>
                 {/if}