Merge branch 'master' into master

backend/src/api/controllers/result.ts

@@ -437,7 +437,12 @@ export async function addResult(
 
   if (completedEvent.mode === "time" && completedEvent.mode2 === "60") {
     void UserDAL.incrementBananas(uid, completedEvent.wpm);
-    if (isPb && user.discordId !== undefined && user.discordId !== "") {
+    if (
+      isPb &&
+      user.discordId !== undefined &&
+      user.discordId !== "" &&
+      user.lbOptOut !== true
+    ) {
       void GeorgeQueue.updateDiscordRole(user.discordId, completedEvent.wpm);
     }
   }

frontend/src/styles/media-queries-green.scss

@@ -52,7 +52,7 @@
   .pageTest {
     #result .wrapper .stats.morestats {
       display: grid;
-      grid-template-columns: 1fr 1fr 1fr;
+      grid-template-columns: repeat(3, max-content);
       grid-template-rows: 1fr 1fr;
     }
     #liveStatsTextTop,

frontend/src/styles/media-queries-purple.scss

@@ -75,6 +75,11 @@
       .morestats {
         justify-self: unset;
         width: unset;
+
+        .group .bottom::after {
+          transform: none;
+          left: 0;
+        }
       }
       .buttons {
         grid-template-columns: 1fr 1fr;

frontend/src/ts/elements/profile.ts

@@ -189,7 +189,7 @@ export async function update(
       console.debug(hoverText);
 
       if (streakOffset === undefined) {
-        hoverText += `\n\nIf the streak reset time doesn't line up with your timezone, you can change it in Settings > Danger zone > Update streak hour offset.`;
+        hoverText += `\n\nIf the streak reset time doesn't line up with your timezone, you can change it in Account Settings > Account > Set streak hour offset.`;
       }
     }
   }

frontend/src/ts/pages/login.ts

@@ -6,6 +6,7 @@ import { InputIndicator } from "../elements/input-indicator";
 import * as Skeleton from "../utils/skeleton";
 import * as Misc from "../utils/misc";
 import TypoList from "../utils/typo-list";
+import { z } from "zod";
 
 export function enableSignUpButton(): void {
   $(".page.pageLogin .register.side button").prop("disabled", false);
@@ -81,16 +82,14 @@ const checkNameDebounced = debounce(1000, async () => {
 
 const checkEmail = (): void => {
   const email = $(".page.pageLogin .register.side .emailInput").val() as string;
-  const emailRegex =
-    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
   const educationRegex =
     /@.*(student|education|school|\.edu$|\.edu\.|\.ac\.|\.sch\.)/i;
 
   const emailHasTypo = TypoList.some((typo) => {
     return email.endsWith(typo);
   });
 
-  if (emailRegex.test(email)) {
+  if (z.string().email().safeParse(email).success) {
     if (emailHasTypo) {
       emailIndicator.show(
         "typo",
@@ -105,7 +104,7 @@ const checkEmail = (): void => {
       emailIndicator.show("valid");
     }
   } else {
-    emailIndicator.show("invalid");
+    emailIndicator.show("invalid", "Please enter a valid email address.");
   }
 
   updateSignupButton();

frontend/src/ts/test/result.ts

@@ -393,6 +393,8 @@ export async function updateCrown(dontSave: boolean): Promise<void> {
   let pbDiff = 0;
   const canGetPb = await resultCanGetPb();
 
+  console.debug("Result can get PB:", canGetPb.value, canGetPb.reason ?? "");
+
   if (canGetPb.value) {
     const localPb = await DB.getLocalPB(
       Config.mode,
@@ -406,10 +408,13 @@ export async function updateCrown(dontSave: boolean): Promise<void> {
     );
     const localPbWpm = localPb?.wpm ?? 0;
     pbDiff = result.wpm - localPbWpm;
+    console.debug("Local PB", localPb, "diff", pbDiff);
     if (pbDiff <= 0) {
       hideCrown();
+      console.debug("Hiding crown");
     } else {
       //show half crown as the pb is not confirmed by the server
+      console.debug("Showing pending crown");
       showCrown("pending");
       updateCrownText(
         "+" + Format.typingSpeed(pbDiff, { showDecimalPlaces: true })
@@ -428,14 +433,17 @@ export async function updateCrown(dontSave: boolean): Promise<void> {
     );
     const localPbWpm = localPb?.wpm ?? 0;
     pbDiff = result.wpm - localPbWpm;
+    console.debug("Local PB", localPb, "diff", pbDiff);
     if (pbDiff <= 0) {
       // hideCrown();
+      console.debug("Showing warning crown");
       showCrown("warning");
       updateCrownText(
         `This result is not eligible for a new PB (${canGetPb.reason})`,
         true
       );
     } else {
+      console.debug("Showing ineligible crown");
       showCrown("ineligible");
       updateCrownText(
         `You could've gotten a new PB (+${Format.typingSpeed(pbDiff, {
@@ -462,14 +470,10 @@ export function showErrorCrownIfNeeded(): void {
   );
 }
 
-type CanGetPbObject =
-  | {
-      value: true;
-    }
-  | {
-      value: false;
-      reason: string;
-    };
+type CanGetPbObject = {
+  value: boolean;
+  reason?: string;
+};
 
 async function resultCanGetPb(): Promise<CanGetPbObject> {
   const funboxes = result.funbox?.split("#") ?? [];

frontend/static/languages/_groups.json

@@ -439,7 +439,7 @@
   },
   {
     "name": "nepali",
-    "languages": ["nepali", "nepali_1k"]
+    "languages": ["nepali", "nepali_1k", "nepali_romanized"]
   },
   {
     "name": "santali",
@@ -581,6 +581,10 @@
       "occitan_10k"
     ]
   },
+  {
+    "name": "zulu",
+    "languages": ["zulu"]
+  },
   {
     "name": "code",
     "languages": [

frontend/static/languages/_list.json

@@ -22,6 +22,7 @@
   ,"french_600k"
   ,"nepali"
   ,"nepali_1k"
+  ,"nepali_romanized"
   ,"sanskrit"
   ,"sanskrit_roman"
   ,"santali"
@@ -315,6 +316,7 @@
   ,"occitan_5k"
   ,"occitan_10k"
   ,"bashkir"
+  ,"zulu"
   ,"code_python"
   ,"code_python_1k"
   ,"code_python_2k"

frontend/static/languages/english_25k.json

@@ -7218,7 +7218,6 @@
     "accomodate",
     "prim",
     "cilium",
-    "titty",
     "feud",
     "Aden",
     "intercalation",
@@ -7319,7 +7318,6 @@
     "downhill",
     "awing",
     "rotunda",
-    "tittie",
     "plow",
     "thewed",
     "safari",
@@ -13100,7 +13098,6 @@
     "draughts",
     "grange",
     "tenesmus",
-    "faeces",
     "laminate",
     "Maori",
     "limo",