diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md index e269fbe24..657826fdf 100644 --- a/server/CHANGELOG.md +++ b/server/CHANGELOG.md @@ -15,7 +15,7 @@ not generally be shown to end users. # Changelog -## 2.1.0 (Ongoing Development) +## 2.1.0 - [FEAT] Added Jubeat Support. (#169) - [FEAT] Added Pop'n Music Support. (#69) diff --git a/server/package.json b/server/package.json index daf9ed604..bffbb4fee 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "tachi-server", - "version": "2.1.1", + "version": "2.1.2", "description": "A score tracking server.", "main": "js/index.js", "private": true, @@ -82,7 +82,7 @@ "rimraf": "3.0.2", "safe-json-stringify": "1.2.0", "seq-logging": "1.1.1", - "tachi-common": "0.5.14", + "tachi-common": "0.5.15", "ts-node": "10.4.0", "tsconfig-paths": "3.12.0", "typescript": "4.5.5", diff --git a/server/pnpm-lock.yaml b/server/pnpm-lock.yaml index c7e9d27ed..d6008c4c7 100644 --- a/server/pnpm-lock.yaml +++ b/server/pnpm-lock.yaml @@ -63,7 +63,7 @@ specifiers: safe-json-stringify: 1.2.0 seq-logging: 1.1.1 supertest: 6.2.2 - tachi-common: 0.5.14 + tachi-common: 0.5.15 tap: 15.1.6 ts-node: 10.4.0 tsconfig-paths: 3.12.0 @@ -108,7 +108,7 @@ dependencies: rimraf: 3.0.2 safe-json-stringify: 1.2.0 seq-logging: 1.1.1 - tachi-common: 0.5.14 + tachi-common: 0.5.15 ts-node: 10.4.0_2615db9039ce432b4abf2fc39ef336ec tsconfig-paths: 3.12.0 typescript: 4.5.5 @@ -4449,13 +4449,6 @@ packages: hasBin: true dev: true - /optional-require/1.1.8: - resolution: {integrity: sha512-jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA==} - engines: {node: '>=4'} - dependencies: - require-at: 1.0.6 - dev: false - /optionator/0.9.1: resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} engines: {node: '>= 0.8.0'} @@ -4857,11 +4850,6 @@ packages: uuid: 3.4.0 dev: true - /require-at/1.0.6: - resolution: {integrity: sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==} - engines: {node: '>=4'} - dev: false - /require-directory/2.1.1: resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=} engines: {node: '>=0.10.0'} @@ -5296,8 +5284,8 @@ packages: engines: {node: '>= 0.4'} dev: true - /tachi-common/0.5.14: - resolution: {integrity: sha512-jpElo2fvAAdRCDGnlKAP7uuyag7QEP0QlyoVSh8HdM0tCOr6Nov9jJ50adcER+HfEfBvnFIE5V8DRow5LWhQJw==} + /tachi-common/0.5.15: + resolution: {integrity: sha512-7pBspD/7TduoJu1OdguRRxg5LyWwodhbZi5NU4y6aviJmHRetTwWXksCi4QBc72NbKlwqGwnbGrxdKFKdKQNhQ==} dependencies: monk: 7.3.4 transitivePeerDependencies: diff --git a/server/src/lib/constants/version.ts b/server/src/lib/constants/version.ts index 3986baa1b..8f8a429f7 100644 --- a/server/src/lib/constants/version.ts +++ b/server/src/lib/constants/version.ts @@ -4,7 +4,7 @@ const MAJOR = 2; const MINOR = 1; -const PATCH = 1; +const PATCH = 2; // As is with all front-facing zkldi projects, the version names for tachi-server // are from an album I like. In this case, the album is Portishead - Dummy. diff --git a/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts index cbaa3896f..d3734f9e2 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts @@ -66,22 +66,14 @@ const OldLeggendariaConversionTable: Record = { 11100: 11032, // spiral galaxy† -> spiral galaxy 11101: 11012, - // SigSig -> SigSig - 12028: 12028, // Little Little Princess† -> Little Little Princess 12100: 12002, // CONTRACT† -> CONTRACT 13100: 13010, - // GOLD RUSH -> GOLD RUSH - 14007: 14007, - // 零 - ZERO - -> 零 - ZERO - - 14012: 14012, // VANESSA† -> VANESSA 14100: 14009, // KAMAITACHI† -> KAMAITACHI 14101: 14046, - // 華爛漫 -Flowers- -> 華爛漫 -Flowers- - 15054: 15054, // ICARUS† -> ICARUS 15101: 15023, // THE DEEP STRIKER† -> THE DEEP STRIKER diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts index 995935dfa..8256c82f1 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts @@ -255,6 +255,7 @@ export async function ResolveMatchTypeToKTData( } else if (data.matchType === "inGameID") { const gamesWithInGameIDSupport = [ "iidx", + "popn", "ddr", "sdvx", "jubeat", diff --git a/server/src/lib/score-import/import-types/ir/beatoraja/converter.ts b/server/src/lib/score-import/import-types/ir/beatoraja/converter.ts index 598d06f11..980611978 100644 --- a/server/src/lib/score-import/import-types/ir/beatoraja/converter.ts +++ b/server/src/lib/score-import/import-types/ir/beatoraja/converter.ts @@ -27,6 +27,7 @@ const LAMP_LOOKUP = { ExHard: "EX HARD CLEAR", FullCombo: "FULL COMBO", Perfect: "FULL COMBO", + Max: "FULL COMBO", } as const; const RANDOM_LOOKUP = { 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 18ba11bfa..cfba96d62 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 @@ -25,7 +25,8 @@ const PR_BeatorajaScore = { "Hard", "ExHard", "FullCombo", - "Perfect" + "Perfect", + "Max" ), assist: p.is(0), maxcombo: p.isPositiveInteger, diff --git a/server/src/lib/score-import/import-types/ir/beatoraja/types.ts b/server/src/lib/score-import/import-types/ir/beatoraja/types.ts index 4a20948a5..584fc4e11 100644 --- a/server/src/lib/score-import/import-types/ir/beatoraja/types.ts +++ b/server/src/lib/score-import/import-types/ir/beatoraja/types.ts @@ -44,7 +44,8 @@ export interface BeatorajaScore { | "Hard" | "ExHard" | "FullCombo" - | "Perfect"; + | "Perfect" + | "Max"; assist: 0; maxcombo: integer; diff --git a/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/router.ts b/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/router.ts index d07f788cc..ff94e3f35 100644 --- a/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/router.ts +++ b/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/router.ts @@ -115,7 +115,7 @@ router.get("/history", async (req, res) => { game: 0, playtype: 0, }, - limit: 90, + limit: 30, } )) as Omit[];