fixed duplicate imports

backend/src/api/controllers/result.ts

@@ -36,7 +36,6 @@ import { getDailyLeaderboard } from "../../utils/daily-leaderboards";
 import AutoRoleList from "../../constants/auto-roles";
 import * as UserDAL from "../../dal/user";
 import { buildMonkeyMail } from "../../utils/monkey-mail";
-import { updateStreak } from "../../dal/user";
 
 try {
   if (anticheatImplemented() === false) throw new Error("undefined");
@@ -371,7 +370,7 @@ export async function addResult(
     );
   }
 
-  const streak = await updateStreak(uid, result.timestamp);
+  const streak = await UserDAL.updateStreak(uid, result.timestamp);
 
   const xpGained = await calculateXp(
     result,

backend/src/api/routes/index.ts

@@ -2,7 +2,6 @@ import _ from "lodash";
 import psas from "./psas";
 import users from "./users";
 import { join } from "path";
-import express from "express";
 import quotes from "./quotes";
 import configs from "./configs";
 import results from "./results";
@@ -15,7 +14,13 @@ import addSwaggerMiddlewares from "./swagger";
 import { asyncHandler } from "../../middlewares/api-utils";
 import { MonkeyResponse } from "../../utils/monkey-response";
 import { recordClientVersion } from "../../utils/prometheus";
-import { Application, NextFunction, Response, Router } from "express";
+import {
+  Application,
+  NextFunction,
+  Response,
+  Router,
+  static as expressStatic,
+} from "express";
 
 const pathOverride = process.env.API_PATH_OVERRIDE;
 const BASE_ROUTE = pathOverride ? `/${pathOverride}` : "";
@@ -41,7 +46,7 @@ function addApiRoutes(app: Application): void {
   app.use("/configuration", configuration);
 
   if (process.env.MODE === "dev") {
-    app.use("/configure", express.static(join(__dirname, "../../../private")));
+    app.use("/configure", expressStatic(join(__dirname, "../../../private")));
   }
 
   addSwaggerMiddlewares(app);

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

@@ -1,5 +1,9 @@
-import { Analytics as AnalyticsType, getAnalytics } from "firebase/analytics";
-import { logEvent, setAnalyticsCollectionEnabled } from "firebase/analytics";
+import {
+  Analytics as AnalyticsType,
+  getAnalytics,
+  logEvent,
+  setAnalyticsCollectionEnabled,
+} from "firebase/analytics";
 import { app as firebaseApp } from "../firebase";
 
 export let Analytics: AnalyticsType;

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

@@ -48,6 +48,7 @@ import * as ConfigEvent from "../observables/config-event";
 import format from "date-fns/format";
 import "chartjs-adapter-date-fns";
 
+// eslint-disable-next-line no-duplicate-imports -- need to ignore because eslint doesnt know what import type is
 import type {
   AnimationSpec,
   CartesianScaleOptions,
@@ -59,6 +60,7 @@ import type {
   ScaleChartOptions,
 } from "chart.js";
 
+// eslint-disable-next-line no-duplicate-imports -- need to ignore because eslint doesnt know what import type is
 import type {
   AnnotationOptions,
   LabelOptions,

frontend/src/ts/index.ts

@@ -18,7 +18,6 @@ import "./test/caps-warning";
 import "./popups/support-popup";
 import "./popups/contact-popup";
 import "./popups/version-popup";
-import "./popups/video-ad-popup";
 import "./popups/edit-preset-popup";
 import "./popups/simple-popups";
 import "./controllers/input-controller";

frontend/src/ts/popups/mobile-test-config-popup.ts

@@ -1,6 +1,5 @@
 import * as TestLogic from "../test/test-logic";
-import Config from "../config";
-import * as UpdateConfig from "../config";
+import Config, * as UpdateConfig from "../config";
 import * as ManualRestart from "../test/manual-restart-tracker";
 import * as CustomWordAmountPopup from "./custom-word-amount-popup";
 import * as CustomTestDurationPopup from "./custom-test-duration-popup";

frontend/src/ts/test/result.ts

@@ -19,6 +19,7 @@ import * as TestConfig from "./test-config";
 import { Chart } from "chart.js";
 import { Auth } from "../firebase";
 
+// eslint-disable-next-line no-duplicate-imports -- need to ignore because eslint doesnt know what import type is
 import type { PluginChartOptions, ScaleChartOptions } from "chart.js";
 import type { AnnotationOptions } from "chartjs-plugin-annotation";
 import Ape from "../ape";