[pull] master from monkeytypegame:master

README.md

@@ -69,4 +69,4 @@ All of the [contributors](https://github.com/monkeytypegame/monkeytype/graphs/co
 
 # Support
 
-If you wish to support further development and feel extra awesome, you can [donate](https://ko-fi.com/monkeytype), [become a Patron](https://www.patreon.com/monkeytype) or [buy a t-shirt](https://www.monkeytype.store/).
+If you wish to support further development and feel extra awesome, you can [donate](https://ko-fi.com/monkeytype), [become a Patron](https://www.patreon.com/monkeytype), or [buy a t-shirt](https://www.monkeytype.store/).

backend/package.json

@@ -53,7 +53,7 @@
     "string-similarity": "4.0.4",
     "swagger-stats": "0.99.7",
     "ua-parser-js": "0.7.33",
-    "uuid": "10.0.0",
+    "uuid": "14.0.0",
     "winston": "3.6.0",
     "zod": "3.23.8"
   },
@@ -77,7 +77,7 @@
     "@types/swagger-stats": "0.95.11",
     "@types/ua-parser-js": "0.7.36",
     "@types/uuid": "10.0.0",
-    "@vitest/coverage-v8": "4.0.15",
+    "@vitest/coverage-v8": "4.1.5",
     "concurrently": "8.2.2",
     "openapi3-ts": "2.0.2",
     "oxlint": "1.60.0",

frontend/package.json

@@ -76,7 +76,7 @@
     "zod-urlsearchparams": "0.0.16"
   },
   "devDependencies": {
-    "@eslint/json": "1.0.1",
+    "@eslint/json": "1.2.0",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@monkeytype/oxlint-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
@@ -94,7 +94,7 @@
     "@types/object-hash": "3.0.6",
     "@types/subset-font": "1.4.3",
     "@types/throttle-debounce": "5.0.2",
-    "@vitest/coverage-v8": "4.0.15",
+    "@vitest/coverage-v8": "4.1.5",
     "autoprefixer": "10.4.27",
     "caniuse-lite": "1.0.30001778",
     "concurrently": "8.2.2",

frontend/src/styles/settings.scss

@@ -546,6 +546,9 @@
         gap: 0.5rem;
         .button {
           transition: transform 0.125s;
+          &:hover {
+            z-index: 10;
+          }
           &:hover .themeBubbles {
             opacity: 1;
           }

frontend/src/ts/constants/languages.ts

@@ -185,6 +185,7 @@ export const LanguageGroups: Record<string, Language[]> = {
   jyutping: ["jyutping"],
   pinyin: ["pinyin", "pinyin_1k", "pinyin_10k"],
   hausa: ["hausa", "hausa_1k"],
+  bemba: ["bemba", "bemba_1k", "bemba_10k"],
   swedish: ["swedish", "swedish_1k", "swedish_diacritics"],
   serbian: ["serbian", "serbian_latin", "serbian_10k", "serbian_latin_10k"],
   georgian: ["georgian"],

frontend/src/ts/controllers/theme-controller.ts

@@ -85,7 +85,21 @@ function updateThemeIndicator(nameOverride?: string): void {
   //text
   let str: string = Config.theme;
   if (randomTheme !== null) str = randomTheme;
-  if (Config.customTheme) str = "custom";
+
+  if (Config.customTheme && nameOverride === undefined) {
+    // Match current custom theme by colors since Config does not store custom theme IDs
+    const snapshot = DB.getSnapshot();
+    const matchedTheme = snapshot?.customThemes?.find((ct) =>
+      Arrays.areSortedArraysEqual(ct.colors, Config.customThemeColors),
+    );
+
+    if (matchedTheme) {
+      str = `${matchedTheme.name} (custom)`;
+    } else {
+      str = "custom";
+    }
+  }
+
   if (nameOverride !== undefined && nameOverride !== "") str = nameOverride;
   str = str.replace(/_/g, " ");
 

frontend/static/languages/bemba.json

@@ -0,0 +1,210 @@
+{
+  "name": "bemba",
+  "rightToLeft": false,
+  "ligatures": false,
+  "orderedByFrequency": false,
+  "bcp47": "bem",
+  "words": [
+    "menshi",
+    "boi",
+    "ncende",
+    "kuncende",
+    "naikala",
+    "fimo",
+    "ifimuti",
+    "mumulu",
+    "bafwele",
+    "ibumba",
+    "ilyo",
+    "mune",
+    "ica",
+    "mumbali",
+    "nabekala",
+    "ico",
+    "ilya",
+    "ati",
+    "ama",
+    "moneka",
+    "buta",
+    "ba",
+    "ifyakufwala",
+    "abana",
+    "umbi",
+    "batatu",
+    "panse",
+    "elyo",
+    "anda",
+    "ilemoneka",
+    "wa",
+    "naikata",
+    "nabeminina",
+    "incende",
+    "abengi",
+    "apa",
+    "na",
+    "umuntu",
+    "naiminina",
+    "ukuti",
+    "fita",
+    "ca",
+    "kumbali",
+    "awe",
+    "buuta",
+    "ninshi",
+    "mupepi",
+    "umupila",
+    "nangula",
+    "aya",
+    "abalumendo",
+    "ee",
+    "ifi",
+    "umwanakashi",
+    "ishati",
+    "aka",
+    "ili",
+    "bambi",
+    "efyo",
+    "no",
+    "inkanda",
+    "balemoneka",
+    "limbi",
+    "nabafwala",
+    "ale",
+    "cine",
+    "namayo",
+    "kulemoneka",
+    "abaume",
+    "yabo",
+    "nalimo",
+    "cipalile",
+    "bale",
+    "ni",
+    "nomba",
+    "katapa",
+    "iya",
+    "kuti",
+    "shitata",
+    "kwena",
+    "mwi",
+    "abeminine",
+    "kabalwe",
+    "palya",
+    "ameenshi",
+    "ikwete",
+    "ishitali",
+    "petebulo",
+    "shi",
+    "uwiminine",
+    "alemoneka",
+    "nkanda",
+    "ici",
+    "akalumendo",
+    "yaba",
+    "muku",
+    "uyo",
+    "cilya",
+    "icilemoneka",
+    "kulubali",
+    "finshi",
+    "fye",
+    "mulu",
+    "ukuba",
+    "afwele",
+    "nayo",
+    "nabekata",
+    "abale",
+    "kanwa",
+    "pambali",
+    "bwangalo",
+    "nabambi",
+    "isabi",
+    "cile",
+    "ulubilo",
+    "akatalamukila",
+    "mumuulu",
+    "ifya",
+    "bene",
+    "munuma",
+    "wasosa",
+    "kwisa",
+    "natoloka",
+    "noku",
+    "uku",
+    "abaletamba",
+    "aleteya",
+    "konse",
+    "panshi",
+    "amolu",
+    "katwishi",
+    "ukumona",
+    "umukashana",
+    "tafwele",
+    "alifye",
+    "kukulyo",
+    "meenshi",
+    "panono",
+    "ukubomfya",
+    "pantashi",
+    "cikuulwa",
+    "imfula",
+    "kashikila",
+    "balumendo",
+    "untu",
+    "mpanga",
+    "alikwata",
+    "futi",
+    "amabwe",
+    "beta",
+    "ubwato",
+    "akamupila",
+    "cakwe",
+    "nakasote",
+    "kumulu",
+    "ncinga",
+    "walanda",
+    "abekele",
+    "icintu",
+    "insalu",
+    "ishingi",
+    "nikwisa",
+    "lamya",
+    "sha",
+    "kamo",
+    "netoloshi",
+    "nefyo",
+    "katapakatapa",
+    "walungika",
+    "muli",
+    "beshile",
+    "umunankwe",
+    "iyafita",
+    "makumbi",
+    "icimuti",
+    "bonse",
+    "abo",
+    "munshita",
+    "nakafwala",
+    "panuma",
+    "yakasuba",
+    "toloshi",
+    "banjo",
+    "imyotoka",
+    "lya",
+    "shile",
+    "tubili",
+    "kukuso",
+    "emulandu",
+    "pakutila",
+    "mayo",
+    "bwino",
+    "beka",
+    "pancende",
+    "shilemoneka",
+    "akabwa",
+    "ukuya",
+    "fili",
+    "umwana",
+    "nabika",
+    "nefimuti"
+  ]
+}