From 15b6b0bd5e98b1c6dc8928000256bf19c05f907c Mon Sep 17 00:00:00 2001
From: Waterdragen <96000090+Waterdragen@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:11:38 +0800
Subject: [PATCH 1/2] Update akl command logic to check role colors

---
 cmds/akl.py | 88 +++++++++++++++++------------------------------------
 1 file changed, 28 insertions(+), 60 deletions(-)

diff --git a/cmds/akl.py b/cmds/akl.py
index 45f1418c867..cbed0c526d2 100644
--- a/cmds/akl.py
+++ b/cmds/akl.py
@@ -1,74 +1,42 @@
-from discord import Client, Guild
-from typing import Iterable, TypeVar
-
-_VT = TypeVar('_VT')
+from discord import Colour, Client, Guild
 
 AKL_ID = 807843650717483049
 
-LAYOUT_ROLES: list[str] = [
-    'CTGAP',
-    'Workman',
-    'Taipo',
-    'TypeHack',
-    'SIND',
-    'Steno',
-    'Sertain',
-    'Semimak',
-    'RSTHD',
-    'RSI Terminated',
-    'QWERTY',
-    'QGMLWY',
-    'Other (self-made)',
-    'Other',
-    'Nerps',
-    'Neo',
-    'MTGAP',
-    'MessagEase',
-    'ISRT',
-    'Halmak',
-    'Hands Down',
-    'FR-Godox',
-    'Engram',
-    'Dvorak',
-    'Colemak Qi',
-    'ColemaQ',
-    'Colemak DHv',
-    'Colemak DH',
-    'Colemak',
-    'boo'
-    'BÉPO',
-    'BEAKL',
-    'ASETNIOP',
-    'APT',
-    'Canary',
-    'Sturdy',
-    'Nrts Haei',
-    'Recurva',
-]
+LAYOUT_ROLE_COLOUR = Colour.teal()  # 0x1ABC9C
+
+class CaseInsensitiveStr:
+    def __init__(self, value):
+        self.value = value
+
+    def __str__(self):
+        return self.value
 
-class CaseInsensitiveDict(dict):
-    @classmethod
-    def from_iterable(cls, iterable: Iterable[tuple[str, _VT]]):
-        return cls((k.lower(), i) for (k, i) in iterable)
+    def __format__(self, format_spec):
+        return self.value.__format__(format_spec)
 
-    def __getitem__(self, key: str):
-        return super().__getitem__(key.lower())
+    def __hash__(self):
+        return hash(self.value.lower())
 
-    def __contains__(self, key: str):
-        return super().__contains__(key.lower())
+    def __eq__(self, other):
+        if isinstance(other, CaseInsensitiveStr):
+            return self.value.lower() == other.value.lower()
+        elif isinstance(other, str):
+            return self.value.lower() == other.lower()
+        else:
+            return False
 
 def exec(bot: Client):
     guild: Guild = bot.get_guild(AKL_ID)
     if not guild:
         return 'Error: Cannot find akl server'
-
-    roles = guild.roles
-    role_counts: dict[str, int] = CaseInsensitiveDict.from_iterable((role.name, len(role.members)) for role in roles)
-    layout_role_counts: list[tuple[str, int]] = [(layout_role, role_counts[layout_role])
-                                                 for layout_role in LAYOUT_ROLES
-                                                 if layout_role in role_counts]
-
-    layout_role_counts.sort(key=lambda x: x[1], reverse=True)
+    layout_roles = [role for role in guild.roles if role.colour == LAYOUT_ROLE_COLOUR]
+    role_counts = {CaseInsensitiveStr(role.name): len(role.members) for role in layout_roles}
+
+    layout_role_counts: list[tuple[CaseInsensitiveStr, int]] = sorted(
+        role_counts.items(),
+        key=lambda x: x[1],
+        reverse=True,
+    )
     layout_role_counts = layout_role_counts[:20]
 
     res = ['```',

From a68be13bf6a003c09ec0f804bea8a224df07feeb Mon Sep 17 00:00:00 2001
From: Waterdragen <96000090+Waterdragen@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:26:21 +0800
Subject: [PATCH 2/2] Include qwerty

---
 cmds/akl.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmds/akl.py b/cmds/akl.py
index cbed0c526d2..9a83192a42b 100644
--- a/cmds/akl.py
+++ b/cmds/akl.py
@@ -3,6 +3,7 @@
 AKL_ID = 807843650717483049
 
 LAYOUT_ROLE_COLOUR = Colour.teal()  # 0x1ABC9C
+QWERTY = "QWERTY"
 
 class CaseInsensitiveStr:
     def __init__(self, value):
@@ -29,7 +30,7 @@ def exec(bot: Client):
     guild: Guild = bot.get_guild(AKL_ID)
     if not guild:
         return 'Error: Cannot find akl server'
-    layout_roles = [role for role in guild.roles if role.colour == LAYOUT_ROLE_COLOUR]
+    layout_roles = [role for role in guild.roles if role.colour == LAYOUT_ROLE_COLOUR or role.name == QWERTY]
     role_counts = {CaseInsensitiveStr(role.name): len(role.members) for role in layout_roles}
 
     layout_role_counts: list[tuple[CaseInsensitiveStr, int]] = sorted(