fix: remove function getFunctionsFromActiveFunboxes because it does not work (@fehmer) (monkeytypegame#6288)

Author: fehmer

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

@@ -48,7 +48,7 @@ import { navigate } from "./route-controller";
 import { FirebaseError } from "firebase/app";
 import * as PSA from "../elements/psa";
 import defaultResultFilters from "../constants/default-result-filters";
-import { getFunctionsFromActiveFunboxes } from "../test/funbox/list";
+import { getActiveFunboxesWithFunction } from "../test/funbox/list";
 
 export const gmailProvider = new GoogleAuthProvider();
 export const githubProvider = new GithubAuthProvider();
@@ -174,10 +174,8 @@ async function getDataAndInit(): Promise<boolean> {
     UpdateConfig.saveFullConfigToLocalStorage(true);
 
     //funboxes might be different and they wont activate on the account page
-    for (const applyGlobalCSS of getFunctionsFromActiveFunboxes(
-      "applyGlobalCSS"
-    )) {
-      applyGlobalCSS();
+    for (const fb of getActiveFunboxesWithFunction("applyGlobalCSS")) {
+      fb.functions.applyGlobalCSS();
     }
   }
   AccountButton.loading(false);

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

@@ -37,7 +37,7 @@ import * as Loader from "../elements/loader";
 import * as KeyConverter from "../utils/key-converter";
 import {
   findSingleActiveFunboxWithFunction,
-  getFunctionsFromActiveFunboxes,
+  getActiveFunboxesWithFunction,
   isFunboxActiveWithProperty,
 } from "../test/funbox/list";
 
@@ -198,8 +198,8 @@ async function handleSpace(): Promise<void> {
 
   const currentWord: string = TestWords.words.getCurrent();
 
-  for (const handleSpace of getFunctionsFromActiveFunboxes("handleSpace")) {
-    handleSpace();
+  for (const fb of getActiveFunboxesWithFunction("handleSpace")) {
+    fb.functions.handleSpace();
   }
 
   dontInsertSpace = true;
@@ -494,8 +494,8 @@ function handleChar(
 
   const isCharKorean: boolean = TestInput.input.getKoreanStatus();
 
-  for (const handleChar of getFunctionsFromActiveFunboxes("handleChar")) {
-    char = handleChar(char);
+  for (const fb of getActiveFunboxesWithFunction("handleChar")) {
+    char = fb.functions.handleChar(char);
   }
 
   const nospace = isFunboxActiveWithProperty("nospace");
@@ -902,8 +902,8 @@ $(document).on("keydown", async (event) => {
     return;
   }
 
-  for (const handleKeydown of getFunctionsFromActiveFunboxes("handleKeydown")) {
-    void handleKeydown(event);
+  for (const fb of getActiveFunboxesWithFunction("handleKeydown")) {
+    void fb.functions.handleKeydown(event);
   }
 
   //autofocus
@@ -1153,11 +1153,9 @@ $(document).on("keydown", async (event) => {
     }
   }
 
-  for (const preventDefaultEvent of getFunctionsFromActiveFunboxes(
-    "preventDefaultEvent"
-  )) {
+  for (const fb of getActiveFunboxesWithFunction("preventDefaultEvent")) {
     if (
-      await preventDefaultEvent(
+      await fb.functions.preventDefaultEvent(
         //i cant figure this type out, but it works fine
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         event as JQuery.KeyDownEvent

frontend/src/ts/ready.ts

@@ -7,7 +7,7 @@ import * as AccountButton from "./elements/account-button";
 //@ts-expect-error
 import Konami from "konami";
 import * as ServerConfiguration from "./ape/server-configuration";
-import { getFunctionsFromActiveFunboxes } from "./test/funbox/list";
+import { getActiveFunboxesWithFunction } from "./test/funbox/list";
 import { loadPromise } from "./config";
 
 $(async (): Promise<void> => {
@@ -19,10 +19,8 @@ $(async (): Promise<void> => {
   $("body").css("transition", "background .25s, transform .05s");
   MerchBanner.showIfNotClosedBefore();
 
-  for (const applyGlobalCSS of getFunctionsFromActiveFunboxes(
-    "applyGlobalCSS"
-  )) {
-    applyGlobalCSS();
+  for (const fb of getActiveFunboxesWithFunction("applyGlobalCSS")) {
+    fb.functions.applyGlobalCSS();
   }
 
   $("#app")

frontend/src/ts/test/funbox/funbox.ts

@@ -13,7 +13,7 @@ import {
   getActiveFunboxes,
   getActiveFunboxNames,
   get,
-  getFunctionsFromActiveFunboxes,
+  getActiveFunboxesWithFunction,
   isFunboxActiveWithProperty,
   getActiveFunboxesWithProperty,
 } from "./list";
@@ -22,15 +22,15 @@ import { checkForcedConfig } from "./funbox-validation";
 export function toggleScript(...params: string[]): void {
   if (Config.funbox === "none") return;
 
-  for (const toggleScript of getFunctionsFromActiveFunboxes("toggleScript")) {
-    toggleScript(params);
+  for (const fb of getActiveFunboxesWithFunction("toggleScript")) {
+    fb.functions.toggleScript(params);
   }
 }
 
 export function setFunbox(funbox: string): boolean {
   if (funbox === "none") {
-    for (const clearGlobal of getFunctionsFromActiveFunboxes("clearGlobal")) {
-      clearGlobal();
+    for (const fb of getActiveFunboxesWithFunction("clearGlobal")) {
+      fb.functions.clearGlobal();
     }
   }
   FunboxMemory.load();
@@ -199,18 +199,16 @@ export async function activate(funbox?: string): Promise<boolean | undefined> {
   }
 
   ManualRestart.set();
-  for (const applyConfig of getFunctionsFromActiveFunboxes("applyConfig")) {
-    applyConfig();
+  for (const fb of getActiveFunboxesWithFunction("applyConfig")) {
+    fb.functions.applyConfig();
   }
   // ModesNotice.update();
   return true;
 }
 
 export async function rememberSettings(): Promise<void> {
-  for (const rememberSettings of getFunctionsFromActiveFunboxes(
-    "rememberSettings"
-  )) {
-    rememberSettings();
+  for (const fb of getActiveFunboxesWithFunction("rememberSettings")) {
+    fb.functions.rememberSettings();
   }
 }
 

frontend/src/ts/test/funbox/list.ts

@@ -118,19 +118,6 @@ export function getActiveFunboxesWithFunction<F extends keyof FunboxFunctions>(
   ) as FunboxWithFunction<F>[];
 }
 
-/**
- * Get requested, implemented functions from all active funboxes
- * @param functionName name of the function
- * @returns array of each implemented requested function of all active funboxes
- */
-export function getFunctionsFromActiveFunboxes<F extends keyof FunboxFunctions>(
-  functionName: F
-): MandatoryFunboxFunction<F>[] {
-  return getActiveFunboxesWithFunction(functionName).map(
-    (it) => it.functions[functionName]
-  );
-}
-
 /**
  * Check if there is an active funbox implemenging the given function
  * @param functionName function name

frontend/src/ts/test/test-logic.ts

@@ -67,7 +67,7 @@ import * as XPBar from "../elements/xp-bar";
 import {
   findSingleActiveFunboxWithFunction,
   getActiveFunboxes,
-  getFunctionsFromActiveFunboxes,
+  getActiveFunboxesWithFunction,
 } from "./funbox/list";
 import { getFunboxesFromString } from "@monkeytype/funbox";
 import * as CompositionState from "../states/composition";
@@ -112,8 +112,8 @@ export function startTest(now: number): boolean {
   TestTimer.clear();
   Monkey.show();
 
-  for (const start of getFunctionsFromActiveFunboxes("start")) {
-    start();
+  for (const fb of getActiveFunboxesWithFunction("start")) {
+    fb.functions.start();
   }
 
   try {
@@ -335,8 +335,8 @@ export function restart(options = {} as RestartOptions): void {
       await init();
       await PaceCaret.init();
 
-      for (const restart of getFunctionsFromActiveFunboxes("restart")) {
-        restart();
+      for (const fb of getActiveFunboxesWithFunction("restart")) {
+        fb.functions.restart();
       }
 
       if (Config.showAverage !== "off") {

frontend/src/ts/test/test-ui.ts

@@ -32,7 +32,7 @@ import {
 import { convertRemToPixels } from "../utils/numbers";
 import {
   findSingleActiveFunboxWithFunction,
-  getFunctionsFromActiveFunboxes,
+  getActiveFunboxesWithFunction,
 } from "./funbox/list";
 import * as TestState from "./test-state";
 
@@ -656,10 +656,8 @@ export async function screenshot(): Promise<void> {
     }
     (document.querySelector("html") as HTMLElement).style.scrollBehavior =
       "smooth";
-    for (const applyGlobalCSS of getFunctionsFromActiveFunboxes(
-      "applyGlobalCSS"
-    )) {
-      applyGlobalCSS();
+    for (const fb of getActiveFunboxesWithFunction("applyGlobalCSS")) {
+      fb.functions.applyGlobalCSS();
     }
   }
 
@@ -700,8 +698,8 @@ export async function screenshot(): Promise<void> {
   $(".highlightContainer").addClass("hidden");
   if (revertCookie) $("#cookiesModal").addClass("hidden");
 
-  for (const clearGlobal of getFunctionsFromActiveFunboxes("clearGlobal")) {
-    clearGlobal();
+  for (const fb of getActiveFunboxesWithFunction("clearGlobal")) {
+    fb.functions.clearGlobal();
   }
 
   (document.querySelector("html") as HTMLElement).style.scrollBehavior = "auto";

frontend/src/ts/test/words-generator.ts

@@ -19,7 +19,7 @@ import { FunboxWordOrder, LanguageObject } from "../utils/json-data";
 import {
   findSingleActiveFunboxWithFunction,
   getActiveFunboxes,
-  getFunctionsFromActiveFunboxes,
+  getActiveFunboxesWithFunction,
   isFunboxActiveWithFunction,
 } from "./funbox/list";
 
@@ -353,8 +353,8 @@ function applyFunboxesToWord(
   wordIndex: number,
   wordsBound: number
 ): string {
-  for (const alterText of getFunctionsFromActiveFunboxes("alterText")) {
-    word = alterText(word, wordIndex, wordsBound);
+  for (const fb of getActiveFunboxesWithFunction("alterText")) {
+    word = fb.functions.alterText(word, wordIndex, wordsBound);
   }
   return word;
 }