From cf35e9cb98e1bd7675b98d099b365be8a093926c Mon Sep 17 00:00:00 2001 From: zkldi Date: Wed, 16 Jun 2021 12:26:47 +0100 Subject: [PATCH] refactor ParserFunctionReturns(A)Sync to just ParserFunctionReturns --- .../score-import/framework/score-import-main.ts | 2 +- .../framework/score-importing/hydrate-score.ts | 8 +------- .../score-import/framework/sessions/sessions.ts | 4 ++++ .../import-types/api/arc-ddr/parser.ts | 4 ++-- .../import-types/api/arc-iidx/parser.ts | 4 ++-- .../import-types/api/arc-sdvx/parser.ts | 4 ++-- .../import-types/common/api-kai/iidx/parser.ts | 4 ++-- .../import-types/common/api-kai/sdvx/parser.ts | 4 ++-- .../import-types/common/batch-manual/parser.ts | 5 ++--- .../common/eamusement-iidx-csv/parser.ts | 4 ++-- .../lib/score-import/import-types/common/types.ts | 15 ++------------- .../import-types/file/batch-manual/parser.ts | 4 ++-- .../file/eamusement-iidx-csv/parser.ts | 4 ++-- .../import-types/file/mer-iidx/parser.ts | 4 ++-- .../import-types/file/pli-iidx-csv/parser.ts | 4 ++-- .../import-types/file/solid-state-squad/parser.ts | 4 ++-- .../import-types/ir/barbatos/parser.ts | 4 ++-- .../import-types/ir/beatoraja/parser.ts | 4 ++-- .../import-types/ir/direct-manual/parser.ts | 4 ++-- .../import-types/ir/fervidex-static/parser.ts | 4 ++-- .../import-types/ir/fervidex/parser.ts | 4 ++-- .../score-import/import-types/ir/usc/parser.ts | 4 ++-- server/src/server/router/api/v1/auth/router.ts | 3 +-- server/src/utils/queries/songs.ts | 4 ++-- 24 files changed, 47 insertions(+), 62 deletions(-) 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 e75d4ec2d..9281e6dd1 100644 --- a/server/src/lib/score-import/framework/score-import-main.ts +++ b/server/src/lib/score-import/framework/score-import-main.ts @@ -58,7 +58,7 @@ export default async function ScoreImportMain( logger.debug(`Parsing took ${parseTime} miliseconds.`); - // We have to cast here due to typescript generic confusions. This is guaranteed to be correct. + // We have to cast here due to typescript generic confusions. This is guaranteed` to be correct. const ConverterFunction = Converters[importType] as unknown as ConverterFunction; // --- 2. Importing --- diff --git a/server/src/lib/score-import/framework/score-importing/hydrate-score.ts b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts index f5414e0c3..92332684d 100644 --- a/server/src/lib/score-import/framework/score-importing/hydrate-score.ts +++ b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts @@ -1,10 +1,4 @@ -import { - AnyChartDocument, - config, - integer, - ScoreDocument, - AnySongDocument, -} from "tachi-common"; +import { AnyChartDocument, config, integer, ScoreDocument, AnySongDocument } from "tachi-common"; import { KtLogger } from "../../../logger/logger"; import { CreateCalculatedData } from "../calculated-data/calculated-data"; import { CalculateESDForGame } from "../common/score-utils"; diff --git a/server/src/lib/score-import/framework/sessions/sessions.ts b/server/src/lib/score-import/framework/sessions/sessions.ts index dee709bb5..4c5936f24 100644 --- a/server/src/lib/score-import/framework/sessions/sessions.ts +++ b/server/src/lib/score-import/framework/sessions/sessions.ts @@ -203,6 +203,10 @@ export async function LoadScoresIntoSessions( const startOfGroup = groupScores[0].timeAchieved!; const endOfGroup = groupScores[groupScores.length - 1].timeAchieved!; + // A bug exists here where if a session is created + // backwards in time, this will grab your PBs + // from the future. + // @todo #179 const pbs = await db["score-pbs"].find({ chartID: { $in: groupScores.map((e) => e.chartID) }, userID, diff --git a/server/src/lib/score-import/import-types/api/arc-ddr/parser.ts b/server/src/lib/score-import/import-types/api/arc-ddr/parser.ts index 5803a93b4..b2b0dc9e5 100644 --- a/server/src/lib/score-import/import-types/api/arc-ddr/parser.ts +++ b/server/src/lib/score-import/import-types/api/arc-ddr/parser.ts @@ -1,7 +1,7 @@ import { KtLogger } from "../../../../logger/logger"; import nodeFetch from "../../../../../utils/fetch"; import { TraverseKaiAPI } from "../../common/api-kai/traverse-api"; -import { ParserFunctionReturnsAsync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; import { EmptyObject } from "../../../../../utils/types"; import { ARC_API_URL, ARC_AUTH_TOKEN } from "../../../../setup/config"; @@ -9,7 +9,7 @@ export function ParseArcDDR( arcProfileID: string, logger: KtLogger, fetch = nodeFetch -): ParserFunctionReturnsAsync { +): ParserFunctionReturns { return { iterable: TraverseKaiAPI( ARC_API_URL, diff --git a/server/src/lib/score-import/import-types/api/arc-iidx/parser.ts b/server/src/lib/score-import/import-types/api/arc-iidx/parser.ts index f549995da..3933c64ae 100644 --- a/server/src/lib/score-import/import-types/api/arc-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/arc-iidx/parser.ts @@ -1,7 +1,7 @@ import { KtLogger } from "../../../../logger/logger"; import nodeFetch from "../../../../../utils/fetch"; import { TraverseKaiAPI } from "../../common/api-kai/traverse-api"; -import { ParserFunctionReturnsAsync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; import { EmptyObject } from "../../../../../utils/types"; import { ARC_API_URL, ARC_AUTH_TOKEN } from "../../../../setup/config"; import { CreateArcIIDXClassHandler } from "./class-handler"; @@ -10,7 +10,7 @@ export async function ParseArcIIDX( arcProfileID: string, logger: KtLogger, fetch = nodeFetch -): Promise> { +): Promise> { return { iterable: TraverseKaiAPI( ARC_API_URL, diff --git a/server/src/lib/score-import/import-types/api/arc-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/arc-sdvx/parser.ts index 44d9413f5..37f5b1d99 100644 --- a/server/src/lib/score-import/import-types/api/arc-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/arc-sdvx/parser.ts @@ -1,7 +1,7 @@ import { KtLogger } from "../../../../logger/logger"; import nodeFetch from "../../../../../utils/fetch"; import { TraverseKaiAPI } from "../../common/api-kai/traverse-api"; -import { ParserFunctionReturnsAsync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; import { EmptyObject } from "../../../../../utils/types"; import { ARC_API_URL, ARC_AUTH_TOKEN } from "../../../../setup/config"; @@ -9,7 +9,7 @@ export function ParseArcSDVX( arcProfileID: string, logger: KtLogger, fetch = nodeFetch -): ParserFunctionReturnsAsync { +): ParserFunctionReturns { return { iterable: TraverseKaiAPI( ARC_API_URL, diff --git a/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts index 18dafcfde..b2cef62e6 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts @@ -3,7 +3,7 @@ import nodeFetch from "../../../../../../utils/fetch"; import { KaiAuthDocument } from "tachi-common"; import { KaiContext } from "../types"; import { TraverseKaiAPI } from "../traverse-api"; -import { ParserFunctionReturnsAsync } from "../../types"; +import { ParserFunctionReturns } from "../../types"; import { FLO_API_URL, EAG_API_URL } from "../../../../../setup/config"; export function ParseKaiIIDX( @@ -11,7 +11,7 @@ export function ParseKaiIIDX( authDoc: KaiAuthDocument, logger: KtLogger, fetch = nodeFetch -): ParserFunctionReturnsAsync { +): ParserFunctionReturns { const baseUrl = service === "FLO" ? FLO_API_URL : EAG_API_URL; return { diff --git a/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts index 00a230b26..8c4cf8f7d 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts @@ -3,7 +3,7 @@ import nodeFetch from "../../../../../../utils/fetch"; import { KaiAuthDocument } from "tachi-common"; import { KaiContext } from "../types"; import { TraverseKaiAPI } from "../traverse-api"; -import { ParserFunctionReturnsAsync } from "../../types"; +import { ParserFunctionReturns } from "../../types"; import { EAG_API_URL, FLO_API_URL } from "../../../../../setup/config"; export function ParseKaiSDVX( @@ -11,7 +11,7 @@ export function ParseKaiSDVX( authDoc: KaiAuthDocument, logger: KtLogger, fetch = nodeFetch -): ParserFunctionReturnsAsync { +): ParserFunctionReturns { const baseUrl = service === "FLO" ? FLO_API_URL : EAG_API_URL; return { diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts index fa4de2158..2eded9eea 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts @@ -4,10 +4,9 @@ import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; import { lamps, validHitData, validPlaytypes } from "tachi-common/js/config"; import { Game, ImportTypes } from "tachi-common"; -import { ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; import { FormatPrError } from "../../../../../utils/prudence"; -import { ParserFunctionReturnsSync } from "../types"; +import { ParserFunctionReturns } from "../types"; import { CONF_INFO } from "../../../../setup/config"; const optNull = (v: ValidSchemaValue) => p.optional(p.nullable(v)); @@ -117,7 +116,7 @@ export function ParseBatchManualFromObject( object: unknown, importType: ImportTypes, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { // now to perform some basic validation so we can return // the iterable diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts index 9166196e6..40411c39a 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts @@ -1,7 +1,7 @@ import { Difficulties } from "tachi-common"; import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { ParserFunctionReturnsSync } from "../types"; +import { ParserFunctionReturns } from "../types"; import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types"; enum EAM_VERSION_NAMES { @@ -220,7 +220,7 @@ function GenericParseEamIIDXCSV( body: Record, service: string, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { let playtype: "SP" | "DP"; if (body.playtype === "SP") { diff --git a/server/src/lib/score-import/import-types/common/types.ts b/server/src/lib/score-import/import-types/common/types.ts index 9c5b53a1d..91286ebcd 100644 --- a/server/src/lib/score-import/import-types/common/types.ts +++ b/server/src/lib/score-import/import-types/common/types.ts @@ -103,19 +103,8 @@ export interface ImportInputParser { (logger: KtLogger): ParserFunctionReturns | Promise>; } -export type ParserFunctionReturns = - | ParserFunctionReturnsAsync - | ParserFunctionReturnsSync; - -export interface ParserFunctionReturnsAsync { - iterable: AsyncIterable; - context: C; - game: Game; - classHandler: ClassHandler | null; -} - -export interface ParserFunctionReturnsSync { - iterable: Iterable; +export interface ParserFunctionReturns { + iterable: Iterable | AsyncIterable; context: C; game: Game; classHandler: ClassHandler | null; diff --git a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts index 5778c5dac..30dca9037 100644 --- a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts @@ -2,7 +2,7 @@ import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; /** * Parses a buffer of BATCH-MANUAL data. @@ -13,7 +13,7 @@ function ParseBatchManual( fileData: Express.Multer.File, body: Record, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { let jsonData: unknown; try { diff --git a/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts index f33e2c64d..385242ee8 100644 --- a/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts @@ -4,13 +4,13 @@ import { IIDXEamusementCSVContext, IIDXEamusementCSVData, } from "../../common/eamusement-iidx-csv/types"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; function ParseEamusementIIDXCSV( fileData: Express.Multer.File, body: Record, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { return GenericParseEamIIDXCSV(fileData, body, "e-amusement", logger); } diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts b/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts index 25db56569..63d456ed7 100644 --- a/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts @@ -3,7 +3,7 @@ import { FormatPrError } from "../../../../../utils/prudence"; import { EmptyObject } from "../../../../../utils/types"; import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; import { ConvertFileMerIIDX } from "./converter"; import { MerScore } from "./types"; @@ -30,7 +30,7 @@ export function ParseMerIIDX( fileData: Express.Multer.File, body: Record, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { let jsonData; try { diff --git a/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts index 354e6e053..39fa6a401 100644 --- a/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts @@ -4,13 +4,13 @@ import { IIDXEamusementCSVContext, IIDXEamusementCSVData, } from "../../common/eamusement-iidx-csv/types"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; function ParsePLIIIDXCSV( fileData: Express.Multer.File, body: Record, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { return GenericParseEamIIDXCSV(fileData, body, "PLI", logger); } diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.ts index ddea3a173..bf8de700a 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.ts @@ -4,7 +4,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import p, { PrudenceSchema } from "prudence"; import { FormatPrError } from "../../../../../utils/prudence"; import { S3Score } from "./types"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; import { KtLogger } from "../../../../logger/logger"; const PR_SolidState: PrudenceSchema = { @@ -54,7 +54,7 @@ export function ParseSolidStateXML( fileData: Express.Multer.File, body: Record, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { let parsedXML; try { diff --git a/server/src/lib/score-import/import-types/ir/barbatos/parser.ts b/server/src/lib/score-import/import-types/ir/barbatos/parser.ts index 994557728..f4b0bd26f 100644 --- a/server/src/lib/score-import/import-types/ir/barbatos/parser.ts +++ b/server/src/lib/score-import/import-types/ir/barbatos/parser.ts @@ -5,7 +5,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { FormatPrError } from "../../../../../utils/prudence"; import { BarbatosScore } from "./types"; import { ConverterIRBarbatos } from "./converter"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; const PR_Barbatos = { difficulty: p.isIn(1, 2, 3, 4), @@ -28,7 +28,7 @@ const PR_Barbatos = { export function ParseBarbatosSingle( body: Record, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { const err = p(body, PR_Barbatos); if (err) { diff --git a/server/src/lib/score-import/import-types/ir/beatoraja/parser.ts b/server/src/lib/score-import/import-types/ir/beatoraja/parser.ts index 75c63e01d..009e50f33 100644 --- a/server/src/lib/score-import/import-types/ir/beatoraja/parser.ts +++ b/server/src/lib/score-import/import-types/ir/beatoraja/parser.ts @@ -4,7 +4,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { FormatPrError } from "../../../../../utils/prudence"; import { BeatorajaChart, BeatorajaContext, BeatorajaScore } from "./types"; import { ConverterIRBeatoraja } from "./converter"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; const PR_BeatorajaScore = { sha256: "string", @@ -65,7 +65,7 @@ const PR_BeatorajaChart = { export function ParseBeatorajaSingle( body: Record, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { const err = p( body.score, PR_BeatorajaScore, diff --git a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts index d15bc7c83..5d26711b9 100644 --- a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts +++ b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts @@ -1,7 +1,7 @@ import { KtLogger } from "../../../../logger/logger"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; /** * Parses an object of BATCH-MANUAL data. @@ -11,7 +11,7 @@ import { ParserFunctionReturnsSync } from "../../common/types"; function ParseDirectManual( body: Record, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { return ParseBatchManualFromObject(body, "ir/direct-manual", logger); } diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts index 93791cf43..6460e07c0 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts @@ -7,7 +7,7 @@ import { FervidexStaticContext, FervidexStaticScore } from "./types"; import { FerHeaders, SoftwareIDToVersion } from "../fervidex/parser"; import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts"; import { CreateFerStaticClassHandler } from "./class-handler"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; const PR_FervidexStatic: PrudenceSchema = { ex_score: p.isPositiveInteger, @@ -19,7 +19,7 @@ export function ParseFervidexStatic( body: Record, headers: FerHeaders, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { const version = SoftwareIDToVersion(headers.model); const staticScores = body?.scores; diff --git a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts index cb32a7241..c046a734b 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts @@ -12,7 +12,7 @@ import { REV_2DXTRA, REV_OMNIMIX, } from "../../../../constants/ea3id"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; const PR_Fervidex: PrudenceSchema = { chart: p.isIn("spb", "spn", "dpn", "sph", "dph", "spa", "dpa", "spl", "dpl"), @@ -100,7 +100,7 @@ export function ParseFervidexSingle( body: Record, headers: FerHeaders, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { const version = SoftwareIDToVersion(headers.model); // more mods may be added in the future, so lets ignore excess keys. diff --git a/server/src/lib/score-import/import-types/ir/usc/parser.ts b/server/src/lib/score-import/import-types/ir/usc/parser.ts index a7d0add6b..7af8e439a 100644 --- a/server/src/lib/score-import/import-types/ir/usc/parser.ts +++ b/server/src/lib/score-import/import-types/ir/usc/parser.ts @@ -5,7 +5,7 @@ import { FormatPrError } from "../../../../../utils/prudence"; import { USCClientScore } from "../../../../../server/router/ir/usc/types"; import { IRUSCContext } from "./types"; import { ConverterIRUSC } from "./converter"; -import { ParserFunctionReturnsSync } from "../../common/types"; +import { ParserFunctionReturns } from "../../common/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; const PR_USCIRScore: PrudenceSchema = { @@ -27,7 +27,7 @@ export function ParseIRUSC( body: Record, chart: ChartDocument<"usc:Single">, logger: KtLogger -): ParserFunctionReturnsSync { +): ParserFunctionReturns { const err = p( body.score, PR_USCIRScore, diff --git a/server/src/server/router/api/v1/auth/router.ts b/server/src/server/router/api/v1/auth/router.ts index 62aa586bc..ed8d9862b 100644 --- a/server/src/server/router/api/v1/auth/router.ts +++ b/server/src/server/router/api/v1/auth/router.ts @@ -12,7 +12,6 @@ import { GetUserCaseInsensitive, PRIVATEINFO_GetUserCaseInsensitive, } from "../../../../../utils/user"; - import db from "../../../../../external/mongo/db"; import CreateLogCtx from "../../../../../lib/logger/logger"; import prValidate from "../../../../middleware/prudence-validate"; @@ -152,7 +151,7 @@ router.post( }); } - logger.verbose("Captcha validated!"); + logger.debug("Captcha validated."); } else { logger.info("Skipped captcha check because not in production."); } diff --git a/server/src/utils/queries/songs.ts b/server/src/utils/queries/songs.ts index f148f39ae..09248491b 100644 --- a/server/src/utils/queries/songs.ts +++ b/server/src/utils/queries/songs.ts @@ -17,7 +17,7 @@ export function FindSongOnTitle( game: Game, title: string ): Promise> { - // @PERF: Performance should be tested here by having a utility field for all-titles. + // @optimisable: Performance should be tested here by having a utility field for all-titles. return db.songs[game].findOne({ $or: [ { @@ -38,7 +38,7 @@ export function FindSongOnTitleInsensitive( game: Game, title: string ): Promise> { - // @PERF: Performance should be tested here by having a utility field for all-titles. + // @optimisable: Performance should be tested here by having a utility field for all-titles. const regex = new RegExp(`^${EscapeStringRegexp(title)}$`, "iu"); return db.songs[game].findOne({