diff --git a/server/pnpm-lock.yaml b/server/pnpm-lock.yaml index e8d87c402..ed73ce63a 100644 --- a/server/pnpm-lock.yaml +++ b/server/pnpm-lock.yaml @@ -62,7 +62,7 @@ dependencies: express-async-errors: 3.1.1_express@4.17.1 express-session: 1.17.1 fast-json-stable-hash: 1.0.1 - kamaitachi-common: github.com/zkldi/Kamaitachi-common/311e8688639e56931a73cee955daa0a3e7c9a462 + kamaitachi-common: github.com/zkldi/Kamaitachi-common/d3bbf2b8aef1914674afab5b3dc3169def871763 mongodb: 3.6.6 monk: 7.3.4 multer: 1.4.2 @@ -4638,8 +4638,8 @@ packages: '@types/yoga-layout': 1.9.2 dev: true - github.com/zkldi/Kamaitachi-common/311e8688639e56931a73cee955daa0a3e7c9a462: - resolution: {tarball: https://codeload.github.com/zkldi/Kamaitachi-common/tar.gz/311e8688639e56931a73cee955daa0a3e7c9a462} + github.com/zkldi/Kamaitachi-common/d3bbf2b8aef1914674afab5b3dc3169def871763: + resolution: {tarball: https://codeload.github.com/zkldi/Kamaitachi-common/tar.gz/d3bbf2b8aef1914674afab5b3dc3169def871763} name: kamaitachi-common version: 0.1.0 dependencies: diff --git a/server/src/score-import/framework/score-import-main.ts b/server/src/score-import/framework/score-import-main.ts index bd9d2e3a7..10d848e86 100644 --- a/server/src/score-import/framework/score-import-main.ts +++ b/server/src/score-import/framework/score-import-main.ts @@ -126,7 +126,7 @@ function UpdateUsersGameStats( promises.push(UpdateUsersGamePlaytypeStats(game, pt, userID, null, logger)); } - return Promise.all(promises); + return Promise.all(promises).then((r) => r.flat(1)); } function ParseImportInfo(importInfo: ImportProcessingInfo[]) { diff --git a/server/src/score-import/framework/user-game-stats/classes.ts b/server/src/score-import/framework/user-game-stats/classes.ts index 75a757000..04a49c90a 100644 --- a/server/src/score-import/framework/user-game-stats/classes.ts +++ b/server/src/score-import/framework/user-game-stats/classes.ts @@ -1,5 +1,5 @@ -import { Game, Playtypes, integer, UserGameStats } from "kamaitachi-common"; -import { gameClassValues, ClassData, ClassInfo } from "kamaitachi-common/js/game-classes"; +import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; +import { gameClassValues, ClassData } from "kamaitachi-common/js/game-classes"; import deepmerge from "deepmerge"; import db from "../../../db/db"; import { KtLogger } from "../../../types"; diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.ts b/server/src/score-import/framework/user-game-stats/update-ugs.ts index 2848975c3..aa25811b4 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/score-import/framework/user-game-stats/update-ugs.ts @@ -2,7 +2,7 @@ // Some games have dedicated methods to calculate statistics like these, other games do not. // That's about all there is to it! -import { Game, Playtypes, integer, UserGameStats } from "kamaitachi-common"; +import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import db from "../../../db/db"; import { KtLogger } from "../../../types"; import { CalculateClassDeltas, CalculateUGSClasses, ClassHandler } from "./classes"; @@ -14,7 +14,7 @@ export async function UpdateUsersGamePlaytypeStats( userID: integer, customClassFn: ClassHandler | null, logger: KtLogger -) { +): Promise { let { rating, lampRating } = await CalculateRatings(game, playtype, userID, logger); let customRatings = await CalculateCustomRatings(game, playtype, userID, logger);