diff --git a/server/src/lib/score-import/framework/score-import-main.ts b/server/src/lib/score-import/framework/score-import-main.ts index 95be6a7ec..98a0c06a6 100644 --- a/server/src/lib/score-import/framework/score-import-main.ts +++ b/server/src/lib/score-import/framework/score-import-main.ts @@ -12,7 +12,7 @@ import { KtLogger } from "../../../utils/types"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; import { CreateSessions } from "./sessions/sessions"; -import { GetMilisecondsSince } from "../../../utils/util"; +import { GetMilisecondsSince } from "../../../utils/misc"; import { ProcessPBs } from "./pb/process-pbs"; import { UpdateUsersGamePlaytypeStats } from "./user-game-stats/update-ugs"; import db from "../../../external/mongo/db"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts index f6b7d524c..5ef8e4168 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts @@ -4,7 +4,7 @@ import CreateLogCtx from "../../../../logger/logger"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../test-utils/test-data"; import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; -import { EscapeStringRegexp } from "../../../../../utils/util"; +import { EscapeStringRegexp } from "../../../../../utils/misc"; import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; import { Game } from "kamaitachi-common"; import ResetDBState from "../../../../../test-utils/reset-db-state"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts index 4dd0f04a2..1b206a087 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts @@ -4,7 +4,7 @@ import CreateLogCtx from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject as ParserFn } from "./parser"; import { BatchManual } from "./types"; -import { EscapeStringRegexp } from "../../../../../utils/util"; +import { EscapeStringRegexp } from "../../../../../utils/misc"; import deepmerge from "deepmerge"; const mockErr = (...msg: string[]) => diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts index 85c9b669f..d038b973a 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import { GetMilisecondsSince } from "../../../../../utils/util"; +import { GetMilisecondsSince } from "../../../../../utils/misc"; import { CloseMongoConnection } from "../../../../../external/mongo/db"; import CreateLogCtx from "../../../../logger/logger"; import { MockMulterFile } from "../../../../../test-utils/mock-multer"; diff --git a/server/src/server/router/ir/usc/usc.ts b/server/src/server/router/ir/usc/usc.ts index c807ea1da..1bdd2ea2f 100644 --- a/server/src/server/router/ir/usc/usc.ts +++ b/server/src/server/router/ir/usc/usc.ts @@ -1,7 +1,7 @@ import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "kamaitachi-common"; import CreateLogCtx from "../../../../lib/logger/logger"; import { GetPBOnChart, GetServerRecordOnChart } from "../../../../utils/scores"; -import { MStoS } from "../../../../utils/util"; +import { MStoS } from "../../../../utils/misc"; import { USCIR_ADJACENT_SCORE_N } from "../../../../lib/constants/usc-ir"; import db from "../../../../external/mongo/db"; diff --git a/server/src/utils/util.test.ts b/server/src/utils/misc.test.ts similarity index 82% rename from server/src/utils/util.test.ts rename to server/src/utils/misc.test.ts index 0e6897987..d1fe5323c 100644 --- a/server/src/utils/util.test.ts +++ b/server/src/utils/misc.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import { GetMilisecondsSince } from "./util"; +import { GetMilisecondsSince } from "./misc"; t.test("#GetMilisecondsSince", (t) => { const time = GetMilisecondsSince(10n); diff --git a/server/src/utils/util.ts b/server/src/utils/misc.ts similarity index 87% rename from server/src/utils/util.ts rename to server/src/utils/misc.ts index 27c030b53..a743fc183 100644 --- a/server/src/utils/util.ts +++ b/server/src/utils/misc.ts @@ -30,3 +30,10 @@ export function Random20Hex() { export function MStoS(ms: number) { return Math.floor(ms / 1000); } + +/** + * Random From Array - Selects a random value from an array. + */ +export function RFA(arr: unknown[]) { + return arr[Math.floor(Math.random() * arr.length)]; +} diff --git a/server/src/utils/queries/songs.ts b/server/src/utils/queries/songs.ts index 74c829d93..15a0b8dcd 100644 --- a/server/src/utils/queries/songs.ts +++ b/server/src/utils/queries/songs.ts @@ -1,7 +1,7 @@ import { Game, AnySongDocument, integer } from "kamaitachi-common"; import { FindOneResult } from "monk"; import db from "../../external/mongo/db"; -import { EscapeStringRegexp } from "../util"; +import { EscapeStringRegexp } from "../misc"; /** * Finds a song document for the given game with the given title (or alt-title).