diff --git a/server/src/api/ir/fervidex/fervidex.ts b/server/src/api/ir/fervidex/fervidex.ts index 1f7a9f3b0..808d6f788 100644 --- a/server/src/api/ir/fervidex/fervidex.ts +++ b/server/src/api/ir/fervidex/fervidex.ts @@ -2,7 +2,7 @@ import { Router, RequestHandler } from "express"; import { UpdateClassIfGreater } from "../../../common/class"; import { GetUserWithIDGuaranteed } from "../../../common/user"; import { ParseEA3SoftID } from "../../../common/util"; -import { INF2_MODEL, REV_2DXBMS } from "../../../constants/ea3id"; +import { MODEL_INFINITAS_2, REV_2DXBMS } from "../../../constants/ea3id"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../score-import/framework/express-wrapper"; import { ParseFervidexStatic } from "../../../score-import/import-types/ir/fervidex-static/parser"; @@ -24,7 +24,7 @@ const RequireInf2ModelHeader: RequestHandler = (req, res, next) => { try { let softID = ParseEA3SoftID(swModel); - if (softID.model !== INF2_MODEL) { + if (softID.model !== MODEL_INFINITAS_2) { return res.status(400).send({ success: false, description: "This endpoint is only available for INF2 clients.", diff --git a/server/src/constants/ea3id.ts b/server/src/constants/ea3id.ts index efc9cb1b6..d07e48a95 100644 --- a/server/src/constants/ea3id.ts +++ b/server/src/constants/ea3id.ts @@ -1,8 +1,10 @@ // Various EA3-SoftID constants to make code more readable. -export const INF2_MODEL = "P2D"; -export const IIDX_AC_MODEL = "LDJ"; -export const IIDX_AC_LIGHTNING_MODEL = "TDJ"; +export const MODEL_INFINITAS_2 = "P2D"; +export const MODEL_IIDX = "LDJ"; +export const MODEL_IIDX_LIGHTNING = "TDJ"; export const REV_2DXTRA = "E"; export const REV_2DXBMS = "Z"; export const REV_OMNIMIX = "X"; + +export const EXT_HEROIC_VERSE = "2020092900"; diff --git a/server/src/score-import/import-types/ir/fervidex-static/parser.ts b/server/src/score-import/import-types/ir/fervidex-static/parser.ts index 4206a9ed8..fce77c319 100644 --- a/server/src/score-import/import-types/ir/fervidex-static/parser.ts +++ b/server/src/score-import/import-types/ir/fervidex-static/parser.ts @@ -4,7 +4,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { FormatPrError } from "../../../../common/prudence"; import { ConverterIRFervidexStatic } from "./converter"; import { FervidexStaticContext, FervidexStaticScore } from "./types"; -import { FerHeaders, ParseSoftwareModel } from "../fervidex/parser"; +import { FerHeaders, SoftwareIDToVersion } from "../fervidex/parser"; import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts"; const PR_FervidexStatic: PrudenceSchema = { @@ -18,7 +18,7 @@ export function ParseFervidexStatic( headers: FerHeaders, logger: KtLogger ): ParserFunctionReturnsSync { - let version = ParseSoftwareModel(headers.model); + let version = SoftwareIDToVersion(headers.model); let staticScores = body?.scores; diff --git a/server/src/score-import/import-types/ir/fervidex/converter.ts b/server/src/score-import/import-types/ir/fervidex/converter.ts index 88011f5d6..5ac772284 100644 --- a/server/src/score-import/import-types/ir/fervidex/converter.ts +++ b/server/src/score-import/import-types/ir/fervidex/converter.ts @@ -209,6 +209,7 @@ export const ConverterIRFervidex: ConverterFunction { - let version = ParseSoftwareModel(headers.model); + let version = SoftwareIDToVersion(headers.model); // more mods may be added in the future, so lets ignore excess keys. let err = p(body, PR_Fervidex, undefined, { allowExcessKeys: true });