Merge branch 'master' into feature/renove_lodash_omit

Author: fehmer

docs/SECURITY.md

@@ -4,7 +4,7 @@ We take the security and integrity of Monkeytype very seriously. If you have fou
 
 ### Reporting a Vulnerability
 
-For vulnerabilities that impact the confidentiality, integrity, and availability of Monkeytype services, please send your disclosure via [email]([email protected]). For non-security related platform bugs, follow the bug submission [guidelines](https://github.com/monkeytypegame/monkeytype#bug-report-or-feature-request). Include as much detail as possible to ensure reproducibility. At a minimum, vulnerability disclosures should include:
+For vulnerabilities that impact the confidentiality, integrity, and availability of Monkeytype services, please send your disclosure via [email](mailto:[email protected]). For non-security related platform bugs, follow the bug submission [guidelines](https://github.com/monkeytypegame/monkeytype#bug-report-or-feature-request). Include as much detail as possible to ensure reproducibility. At a minimum, vulnerability disclosures should include:
 
 - Vulnerability Description
 - Proof of Concept

frontend/__tests__/utils/strings.spec.ts

@@ -270,7 +270,7 @@ describe("string utils", () => {
     );
   });
 
-  describe("getWordDirection", () => {
+  describe("isWordRightToLeft", () => {
     beforeEach(() => {
       Strings.clearWordDirectionCache();
     });
@@ -321,13 +321,27 @@ describe("string utils", () => {
         languageRTL: boolean,
         _description: string
       ) => {
-        expect(Strings.getWordDirection(word, languageRTL)).toBe(expected);
+        expect(Strings.isWordRightToLeft(word, languageRTL)).toBe(expected);
       }
     );
 
     it("should return languageRTL for undefined word", () => {
-      expect(Strings.getWordDirection(undefined, false)).toBe(false);
-      expect(Strings.getWordDirection(undefined, true)).toBe(true);
+      expect(Strings.isWordRightToLeft(undefined, false)).toBe(false);
+      expect(Strings.isWordRightToLeft(undefined, true)).toBe(true);
+    });
+
+    // testing reverseDirection
+    it("should return true for LTR word with reversed direction", () => {
+      expect(Strings.isWordRightToLeft("hello", false, true)).toBe(true);
+      expect(Strings.isWordRightToLeft("hello", true, true)).toBe(true);
+    });
+    it("should return false for RTL word with reversed direction", () => {
+      expect(Strings.isWordRightToLeft("مرحبا", true, true)).toBe(false);
+      expect(Strings.isWordRightToLeft("مرحبا", false, true)).toBe(false);
+    });
+    it("should return reverse of languageRTL for undefined word with reversed direction", () => {
+      expect(Strings.isWordRightToLeft(undefined, false, true)).toBe(true);
+      expect(Strings.isWordRightToLeft(undefined, true, true)).toBe(false);
     });
 
     describe("caching", () => {
@@ -349,7 +363,7 @@ describe("string utils", () => {
 
       it("should use cache for repeated calls", () => {
         // First call should cache the result (cache miss)
-        const result1 = Strings.getWordDirection("hello", false);
+        const result1 = Strings.isWordRightToLeft("hello", false);
         expect(result1).toBe(false);
         expect(mapSetSpy).toHaveBeenCalledWith("hello", false);
 
@@ -358,7 +372,7 @@ describe("string utils", () => {
         mapSetSpy.mockClear();
 
         // Second call should use cache (cache hit)
-        const result2 = Strings.getWordDirection("hello", false);
+        const result2 = Strings.isWordRightToLeft("hello", false);
         expect(result2).toBe(false);
         expect(mapGetSpy).toHaveBeenCalledWith("hello");
         expect(mapSetSpy).not.toHaveBeenCalled(); // Should not set again
@@ -367,47 +381,47 @@ describe("string utils", () => {
         mapGetSpy.mockClear();
         mapSetSpy.mockClear();
 
-        const result3 = Strings.getWordDirection("hello", true);
+        const result3 = Strings.isWordRightToLeft("hello", true);
         expect(result3).toBe(false); // Still false because "hello" is LTR regardless of language
         expect(mapGetSpy).toHaveBeenCalledWith("hello");
         expect(mapSetSpy).not.toHaveBeenCalled(); // Should not set again
       });
 
       it("should cache based on core word without punctuation", () => {
         // First call should cache the result for core "hello"
-        const result1 = Strings.getWordDirection("hello", false);
+        const result1 = Strings.isWordRightToLeft("hello", false);
         expect(result1).toBe(false);
         expect(mapSetSpy).toHaveBeenCalledWith("hello", false);
 
         mapGetSpy.mockClear();
         mapSetSpy.mockClear();
 
         // These should all use the same cache entry since they have the same core
-        const result2 = Strings.getWordDirection("hello!", false);
+        const result2 = Strings.isWordRightToLeft("hello!", false);
         expect(result2).toBe(false);
         expect(mapGetSpy).toHaveBeenCalledWith("hello");
         expect(mapSetSpy).not.toHaveBeenCalled();
 
         mapGetSpy.mockClear();
         mapSetSpy.mockClear();
 
-        const result3 = Strings.getWordDirection("!hello", false);
+        const result3 = Strings.isWordRightToLeft("!hello", false);
         expect(result3).toBe(false);
         expect(mapGetSpy).toHaveBeenCalledWith("hello");
         expect(mapSetSpy).not.toHaveBeenCalled();
 
         mapGetSpy.mockClear();
         mapSetSpy.mockClear();
 
-        const result4 = Strings.getWordDirection("!hello!", false);
+        const result4 = Strings.isWordRightToLeft("!hello!", false);
         expect(result4).toBe(false);
         expect(mapGetSpy).toHaveBeenCalledWith("hello");
         expect(mapSetSpy).not.toHaveBeenCalled();
       });
 
       it("should handle cache clearing", () => {
         // Cache a result
-        Strings.getWordDirection("test", false);
+        Strings.isWordRightToLeft("test", false);
         expect(mapSetSpy).toHaveBeenCalledWith("test", false);
 
         // Clear cache
@@ -419,14 +433,14 @@ describe("string utils", () => {
         mapClearSpy.mockClear();
 
         // Should work normally after cache clear (cache miss again)
-        const result = Strings.getWordDirection("test", false);
+        const result = Strings.isWordRightToLeft("test", false);
         expect(result).toBe(false);
         expect(mapSetSpy).toHaveBeenCalledWith("test", false);
       });
 
       it("should demonstrate cache miss vs cache hit behavior", () => {
         // Test cache miss - first time seeing this word
-        const result1 = Strings.getWordDirection("unique", false);
+        const result1 = Strings.isWordRightToLeft("unique", false);
         expect(result1).toBe(false);
         expect(mapGetSpy).toHaveBeenCalledWith("unique");
         expect(mapSetSpy).toHaveBeenCalledWith("unique", false);
@@ -435,7 +449,7 @@ describe("string utils", () => {
         mapSetSpy.mockClear();
 
         // Test cache hit - same word again
-        const result2 = Strings.getWordDirection("unique", false);
+        const result2 = Strings.isWordRightToLeft("unique", false);
         expect(result2).toBe(false);
         expect(mapGetSpy).toHaveBeenCalledWith("unique");
         expect(mapSetSpy).not.toHaveBeenCalled(); // No cache set on hit
@@ -444,7 +458,7 @@ describe("string utils", () => {
         mapSetSpy.mockClear();
 
         // Test cache miss - different word
-        const result3 = Strings.getWordDirection("different", false);
+        const result3 = Strings.isWordRightToLeft("different", false);
         expect(result3).toBe(false);
         expect(mapGetSpy).toHaveBeenCalledWith("different");
         expect(mapSetSpy).toHaveBeenCalledWith("different", false);

frontend/src/html/popups.html

@@ -178,7 +178,7 @@
           <div class="title">sentry</div>
           <div class="description">
             We use Sentry to track errors and performance issues on our site, as
-            well as record annonymized user sessions to help us debug issues and
+            well as record anonymized user sessions to help us debug issues and
             improve our product.
           </div>
           <input type="checkbox" />

frontend/src/privacy-policy.html

@@ -307,7 +307,7 @@ <h1 id="Sentry">Sentry</h1>
           Sentry is a crash reporting service that helps us track errors and
           crashes on the website. It collects information about your device,
           browser, and the error that occurred. Sometimes it might also include
-          an annonymized replay of your session. This information is used to
+          an anonymized replay of your session. This information is used to
           track down bugs faster and improve our website.
         </p>
         <p>

frontend/src/styles/fonts.scss

@@ -1,5 +1,13 @@
 @use "sass:map";
 
+@font-face {
+  font-family: "Vazirmatn";
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url("/webfonts/Vazirmatn-Regular.woff2") format("woff2");
+}
+
 @each $font, $config in $fonts {
   $dir: "webfonts";
   $previewDir: "webfonts-preview";

frontend/src/styles/test.scss

@@ -307,10 +307,6 @@
   &.rightToLeftTest {
     //flex-direction: row-reverse; // no need for hacking 😉, CSS fully support right-to-left languages
     direction: rtl;
-    .word {
-      //flex-direction: row-reverse;
-      direction: rtl;
-    }
   }
   &.withLigatures {
     .word {
@@ -749,10 +745,6 @@
         &.rightToLeftTest {
           //flex-direction: row-reverse; // no need for hacking 😉, CSS fully support right-to-left languages
           direction: rtl;
-          .word {
-            //flex-direction: row-reverse;
-            direction: rtl;
-          }
         }
         &.withLigatures {
           .word {

frontend/src/ts/commandline/lists/result-screen.ts

@@ -3,6 +3,7 @@ import * as TestUI from "../../test/test-ui";
 import * as PractiseWordsModal from "../../modals/practise-words";
 import * as Notifications from "../../elements/notifications";
 import * as TestInput from "../../test/test-input";
+import * as TestState from "../../test/test-state";
 import * as TestWords from "../../test/test-words";
 import Config from "../../config";
 import * as PractiseWords from "../../test/practise-words";
@@ -53,7 +54,7 @@ const commands: Command[] = [
     alias: "restart start begin type test typing",
     icon: "fa-chevron-right",
     available: (): boolean => {
-      return TestUI.resultVisible;
+      return TestState.resultVisible;
     },
     exec: (): void => {
       TestLogic.restart();
@@ -69,7 +70,7 @@ const commands: Command[] = [
       });
     },
     available: (): boolean => {
-      return TestUI.resultVisible;
+      return TestState.resultVisible;
     },
   },
   {
@@ -78,7 +79,7 @@ const commands: Command[] = [
     icon: "fa-exclamation-triangle",
     subgroup: practiceSubgroup,
     available: (): boolean => {
-      return TestUI.resultVisible;
+      return TestState.resultVisible;
     },
   },
   {
@@ -89,7 +90,7 @@ const commands: Command[] = [
       TestUI.toggleResultWords();
     },
     available: (): boolean => {
-      return TestUI.resultVisible;
+      return TestState.resultVisible;
     },
   },
   {
@@ -103,7 +104,7 @@ const commands: Command[] = [
       }, 500);
     },
     available: (): boolean => {
-      return TestUI.resultVisible;
+      return TestState.resultVisible;
     },
   },
   {
@@ -117,7 +118,7 @@ const commands: Command[] = [
       }, 500);
     },
     available: (): boolean => {
-      return TestUI.resultVisible;
+      return TestState.resultVisible;
     },
   },
   {
@@ -141,7 +142,7 @@ const commands: Command[] = [
       );
     },
     available: (): boolean => {
-      return TestUI.resultVisible;
+      return TestState.resultVisible;
     },
   },
 ];

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

@@ -5,7 +5,6 @@ import * as ManualRestart from "../test/manual-restart-tracker";
 import * as CustomText from "../test/custom-text";
 import * as Funbox from "../test/funbox/funbox";
 import Config, * as UpdateConfig from "../config";
-import * as TestUI from "../test/test-ui";
 import * as ConfigEvent from "../observables/config-event";
 import * as TestState from "../test/test-state";
 import * as Loader from "../elements/loader";
@@ -28,7 +27,7 @@ export function clearActive(): void {
   if (
     TestState.activeChallenge &&
     !challengeLoading &&
-    !TestUI.testRestarting
+    !TestState.testRestarting
   ) {
     Notifications.add("Challenge cleared", 0);
     TestState.setActiveChallenge(null);