diff --git a/.eslintrc b/.eslintrc index 08cc1f656..c1799c3c8 100644 --- a/.eslintrc +++ b/.eslintrc @@ -48,7 +48,7 @@ "@typescript-eslint/no-unsafe-argument": "off", "@typescript-eslint/no-unsafe-call": "off", // we abuse this one for faking data, but we really shouldn't. - "@typescript-eslint/consistent-type-assertions": "warn" + "@typescript-eslint/consistent-type-assertions": "off" } } ] diff --git a/server/src/lib/score-import/import-types/common/batch-manual/class-handler.ts b/server/src/lib/score-import/import-types/common/batch-manual/class-handler.ts index 86e875880..e25e2d315 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/class-handler.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/class-handler.ts @@ -6,9 +6,14 @@ import type { Classes, GPTString } from "tachi-common"; // Note: This is tested by batch-manuals parser.test.ts. export function CreateBatchManualClassProvider( + outerGptString: GPTString, classes: Partial> ): ClassProvider { return (gptString, userID, ratings, logger) => { + if (outerGptString !== gptString) { + return {}; + } + const gptConfig = GetGPTConfig(gptString); const newObj: Partial> = {}; 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 9627f920a..1cf0bf3eb 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 @@ -2,7 +2,6 @@ import { ParseBatchManualFromObject as ParserFn } from "./parser"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import deepmerge from "deepmerge"; import CreateLogCtx from "lib/logger/logger"; -import { IIDX_DANS } from "tachi-common"; import t from "tap"; import { EscapeStringRegexp } from "utils/misc"; import type { BatchManual } from "tachi-common"; @@ -350,6 +349,7 @@ t.test("#ParserFn", (t) => { t.not(res.classProvider, null); t.strictSame(res.classProvider!("iidx:SP", 1, {}, logger), { dan: "KAIDEN" }); + t.strictSame(res.classProvider!("iidx:DP", 1, {}, logger), {}); t.end(); }); 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 0201fc6c4..099a16eab 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 @@ -2,7 +2,7 @@ import { CreateBatchManualClassProvider } from "./class-handler"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { TachiConfig } from "lib/setup/config"; import { p } from "prudence"; -import { GetGameConfig } from "tachi-common"; +import { GetGameConfig, GetGPTString } from "tachi-common"; import { PR_BATCH_MANUAL } from "tachi-common/lib/schemas"; import { IsRecord, IsValidGame, IsValidPlaytype } from "utils/misc"; import { FormatPrError } from "utils/prudence"; @@ -126,7 +126,7 @@ export function ParseBatchManualFromObject( // if classes are provided, use those as a class handler. Otherwise, we // don't care. classProvider: batchManual.classes - ? CreateBatchManualClassProvider(batchManual.classes) + ? CreateBatchManualClassProvider(GetGPTString(game, playtype), batchManual.classes) : null, }; }