diff --git a/server/package.json b/server/package.json index afa678b5c..7ff499b70 100644 --- a/server/package.json +++ b/server/package.json @@ -54,7 +54,7 @@ "express-session": "^1.17.2", "fast-json-stable-hash": "^1.0.2", "fast-xml-parser": "^3.19.0", - "kamaitachi-common": "github:zkldi/Kamaitachi-common", + "tachi-common": "github:zkldi/tachi-common", "mkdirp": "^1.0.4", "mongodb": "3.6.3", "monk": "^7.3.4", diff --git a/server/pnpm-lock.yaml b/server/pnpm-lock.yaml index 6f200beff..d1dfa18bb 100644 --- a/server/pnpm-lock.yaml +++ b/server/pnpm-lock.yaml @@ -33,7 +33,6 @@ specifiers: express-session: ^1.17.2 fast-json-stable-hash: ^1.0.2 fast-xml-parser: ^3.19.0 - kamaitachi-common: github:zkldi/Kamaitachi-common mkdirp: ^1.0.4 mongodb: 3.6.3 monk: ^7.3.4 @@ -45,6 +44,7 @@ specifiers: redis: ^3.1.2 rimraf: ^3.0.2 supertest: ^6.1.3 + tachi-common: github:zkldi/tachi-common tap: ^15.0.9 ts-node: ^10.0.0 typescript: ^4.3.2 @@ -64,7 +64,6 @@ dependencies: express-session: 1.17.2 fast-json-stable-hash: 1.0.2 fast-xml-parser: 3.19.0 - kamaitachi-common: github.com/zkldi/Kamaitachi-common/ceaccaf38a718a78257d48a36a0c524faa1c5132 mkdirp: 1.0.4 mongodb: 3.6.3 monk: 7.3.4 @@ -73,6 +72,7 @@ dependencies: prudence: 0.9.6 redis: 3.1.2 rimraf: 3.0.2 + tachi-common: github.com/zkldi/tachi-common/ceaccaf38a718a78257d48a36a0c524faa1c5132 typescript: 4.3.2 winston: 3.3.3 @@ -4397,8 +4397,8 @@ packages: engines: {node: '>=6'} dev: true - github.com/zkldi/Kamaitachi-common/ceaccaf38a718a78257d48a36a0c524faa1c5132: - resolution: {tarball: https://codeload.github.com/zkldi/Kamaitachi-common/tar.gz/ceaccaf38a718a78257d48a36a0c524faa1c5132} + github.com/zkldi/tachi-common/ceaccaf38a718a78257d48a36a0c524faa1c5132: + resolution: {tarball: https://codeload.github.com/zkldi/tachi-common/tar.gz/ceaccaf38a718a78257d48a36a0c524faa1c5132} name: kamaitachi-common version: 0.1.0 dependencies: diff --git a/server/scripts/__JSON-TO-KTDB/iidx/diff-sync.ts b/server/scripts/__JSON-TO-KTDB/iidx/diff-sync.ts index 64ac102a3..2361b6f50 100644 --- a/server/scripts/__JSON-TO-KTDB/iidx/diff-sync.ts +++ b/server/scripts/__JSON-TO-KTDB/iidx/diff-sync.ts @@ -5,7 +5,7 @@ import fs from "fs"; import path from "path"; import db from "../../../src/db/db"; import { MDBJson } from "./types"; -import { Difficulties, Playtypes, ChartDocument } from "kamaitachi-common"; +import { Difficulties, Playtypes, ChartDocument } from "tachi-common"; import CreateLogCtx from "../../../src/common/logger"; import { Command } from "commander"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/charts-chunithm.ts b/server/scripts/__KT_DATABASE_MIGRATION/charts-chunithm.ts index 89f2bb8b5..54e5cf407 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/charts-chunithm.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/charts-chunithm.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; -import { gameOrders } from "kamaitachi-common/js/config"; +import { gameOrders } from "tachi-common/js/config"; const logger = CreateLogCtx(__filename); diff --git a/server/scripts/__KT_DATABASE_MIGRATION/charts-ddr.ts b/server/scripts/__KT_DATABASE_MIGRATION/charts-ddr.ts index d5c0a7946..c28ed6366 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/charts-ddr.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/charts-ddr.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { ChartDocument, SongDocument } from "kamaitachi-common"; +import { ChartDocument, SongDocument } from "tachi-common"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; -import { gameOrders } from "kamaitachi-common/js/config"; +import { gameOrders } from "tachi-common/js/config"; import { oldKTDB } from "./old-db"; const logger = CreateLogCtx(__filename); diff --git a/server/scripts/__KT_DATABASE_MIGRATION/charts-gitadora.ts b/server/scripts/__KT_DATABASE_MIGRATION/charts-gitadora.ts index 884eaded2..0b041a2f1 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/charts-gitadora.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/charts-gitadora.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { ChartDocument, SongDocument } from "kamaitachi-common"; +import { ChartDocument, SongDocument } from "tachi-common"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; -import { gameOrders } from "kamaitachi-common/js/config"; +import { gameOrders } from "tachi-common/js/config"; import { oldKTDB } from "./old-db"; const logger = CreateLogCtx(__filename); diff --git a/server/scripts/__KT_DATABASE_MIGRATION/charts-iidx.ts b/server/scripts/__KT_DATABASE_MIGRATION/charts-iidx.ts index 5df6f26e9..f190a6e5a 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/charts-iidx.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/charts-iidx.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; -import { gameOrders } from "kamaitachi-common/js/config"; +import { gameOrders } from "tachi-common/js/config"; const logger = CreateLogCtx(__filename); diff --git a/server/scripts/__KT_DATABASE_MIGRATION/charts-museca.ts b/server/scripts/__KT_DATABASE_MIGRATION/charts-museca.ts index 0a45514df..65d2b4337 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/charts-museca.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/charts-museca.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; -import { gameOrders } from "kamaitachi-common/js/config"; +import { gameOrders } from "tachi-common/js/config"; const logger = CreateLogCtx(__filename); diff --git a/server/scripts/__KT_DATABASE_MIGRATION/charts-sdvx.ts b/server/scripts/__KT_DATABASE_MIGRATION/charts-sdvx.ts index 4741f0cb5..271f23608 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/charts-sdvx.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/charts-sdvx.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; -import { gameOrders } from "kamaitachi-common/js/config"; +import { gameOrders } from "tachi-common/js/config"; const logger = CreateLogCtx(__filename); diff --git a/server/scripts/__KT_DATABASE_MIGRATION/folders.ts b/server/scripts/__KT_DATABASE_MIGRATION/folders.ts index 67ec2b01b..8afd0f766 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/folders.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/folders.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { FolderDocument, Game } from "kamaitachi-common"; -import { validPlaytypes, gameHuman } from "kamaitachi-common/js/config"; +import { FolderDocument, Game } from "tachi-common"; +import { validPlaytypes, gameHuman } from "tachi-common/js/config"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/goals.ts b/server/scripts/__KT_DATABASE_MIGRATION/goals.ts index c5efbe4ed..a13248575 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/goals.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/goals.ts @@ -1,7 +1,7 @@ // oh boy /* eslint-disable @typescript-eslint/no-explicit-any */ -import { GoalDocument } from "kamaitachi-common"; +import { GoalDocument } from "tachi-common"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/other/museca-tierlist.ts b/server/scripts/__KT_DATABASE_MIGRATION/other/museca-tierlist.ts index 498328ec7..c076c37b6 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/other/museca-tierlist.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/other/museca-tierlist.ts @@ -1,5 +1,5 @@ import db from "../../../src/db/db"; -import { TierlistDataDocument } from "kamaitachi-common"; +import { TierlistDataDocument } from "tachi-common"; import { CalculateTierlistDataID } from "../../../src/common/tierlist"; import { oldKTDB } from "../old-db"; import CreateLogCtx from "../../../src/common/logger"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/scores.ts b/server/scripts/__KT_DATABASE_MIGRATION/scores.ts index b99434a73..739d6188c 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/scores.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/scores.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { PrivateUserDocument, ScoreDocument } from "kamaitachi-common"; -import { grades, lamps, supportedGames, validPlaytypes } from "kamaitachi-common/js/config"; +import { PrivateUserDocument, ScoreDocument } from "tachi-common"; +import { grades, lamps, supportedGames, validPlaytypes } from "tachi-common/js/config"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; import CreateLogCtx from "../../src/common/logger"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/songs-chunithm.ts b/server/scripts/__KT_DATABASE_MIGRATION/songs-chunithm.ts index 3ceec9ce9..f56576c9c 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/songs-chunithm.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/songs-chunithm.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { SongDocument } from "kamaitachi-common"; +import { SongDocument } from "tachi-common"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/songs-ddr.ts b/server/scripts/__KT_DATABASE_MIGRATION/songs-ddr.ts index 5dd23abad..d9a4c7c2a 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/songs-ddr.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/songs-ddr.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { SongDocument } from "kamaitachi-common"; -import { gameOrders } from "kamaitachi-common/js/config"; +import { SongDocument } from "tachi-common"; +import { gameOrders } from "tachi-common/js/config"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/songs-gitadora.ts b/server/scripts/__KT_DATABASE_MIGRATION/songs-gitadora.ts index 83b080c5f..16734c8a5 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/songs-gitadora.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/songs-gitadora.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { SongDocument } from "kamaitachi-common"; +import { SongDocument } from "tachi-common"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/songs-iidx.ts b/server/scripts/__KT_DATABASE_MIGRATION/songs-iidx.ts index 47401f682..3f5b1a6c1 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/songs-iidx.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/songs-iidx.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { SongDocument } from "kamaitachi-common"; -import { gameOrders } from "kamaitachi-common/js/config"; +import { SongDocument } from "tachi-common"; +import { gameOrders } from "tachi-common/js/config"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/songs-museca.ts b/server/scripts/__KT_DATABASE_MIGRATION/songs-museca.ts index d72b17d05..ee33f0a2e 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/songs-museca.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/songs-museca.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { SongDocument } from "kamaitachi-common"; +import { SongDocument } from "tachi-common"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/songs-sdvx.ts b/server/scripts/__KT_DATABASE_MIGRATION/songs-sdvx.ts index 809afe762..165fb3820 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/songs-sdvx.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/songs-sdvx.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { SongDocument } from "kamaitachi-common"; +import { SongDocument } from "tachi-common"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/tierlists.ts b/server/scripts/__KT_DATABASE_MIGRATION/tierlists.ts index 091e3f24c..83ce92483 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/tierlists.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/tierlists.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { TierlistParent, Game } from "kamaitachi-common"; -import { gameHuman, validPlaytypes } from "kamaitachi-common/js/config"; +import { TierlistParent, Game } from "tachi-common"; +import { gameHuman, validPlaytypes } from "tachi-common/js/config"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/user-goals.ts b/server/scripts/__KT_DATABASE_MIGRATION/user-goals.ts index d1bf74826..b818e9e29 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/user-goals.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/user-goals.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { UserGoalDocument } from "kamaitachi-common"; +import { UserGoalDocument } from "tachi-common"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/__KT_DATABASE_MIGRATION/users.ts b/server/scripts/__KT_DATABASE_MIGRATION/users.ts index c573c6e73..87d83dc2c 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/users.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/users.ts @@ -1,4 +1,4 @@ -import { PrivateUserDocument } from "kamaitachi-common"; +import { PrivateUserDocument } from "tachi-common"; import db from "../../src/db/db"; import MigrateRecords from "./migrate"; diff --git a/server/scripts/arc-db-sync/arc-db-merge.ts b/server/scripts/arc-db-sync/arc-db-merge.ts index 46ffb7f36..40019b782 100644 --- a/server/scripts/arc-db-sync/arc-db-merge.ts +++ b/server/scripts/arc-db-sync/arc-db-merge.ts @@ -3,7 +3,7 @@ import { ICollection } from "monk"; import path from "path"; import db from "../../src/db/db"; import CreateLogCtx from "../../src/common/logger"; -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; import { FindSongOnTitle } from "../../src/common/database-lookup/song"; import { FindChartWithPTDFVersion } from "../../src/common/database-lookup/chart"; @@ -55,9 +55,9 @@ async function MergeIDs() { } // eslint-disable-next-line no-await-in-loop - await ((db.charts.iidx as unknown) as ICollection< - ChartDocument<"iidx:SP" | "iidx:DP"> - >).update( + await ( + db.charts.iidx as unknown as ICollection> + ).update( { _id: ktchiChart._id, }, diff --git a/server/scripts/iidx-tierlist/get-sp12-data.ts b/server/scripts/iidx-tierlist/get-sp12-data.ts index 4ee5b132a..f51a89e4d 100644 --- a/server/scripts/iidx-tierlist/get-sp12-data.ts +++ b/server/scripts/iidx-tierlist/get-sp12-data.ts @@ -4,7 +4,7 @@ import db from "../../src/db/db"; import fetch from "node-fetch"; import { FindSongOnTitle } from "../../src/common/database-lookup/song"; import { FindChartWithPTDF } from "../../src/common/database-lookup/chart"; -import { Difficulties, TierlistDataDocument } from "kamaitachi-common"; +import { Difficulties, TierlistDataDocument } from "tachi-common"; import { CalculateTierlistDataID } from "../../src/common/tierlist"; import CreateLogCtx from "../../src/common/logger"; diff --git a/server/scripts/iidx-tierlist/parse-iidxkr-data.ts b/server/scripts/iidx-tierlist/parse-iidxkr-data.ts index c32e84b25..28ffa057b 100644 --- a/server/scripts/iidx-tierlist/parse-iidxkr-data.ts +++ b/server/scripts/iidx-tierlist/parse-iidxkr-data.ts @@ -5,7 +5,7 @@ import { CalculateTierlistDataID } from "../../src/common/tierlist"; import { FindSongOnTitle } from "../../src/common/database-lookup/song"; import CreateLogCtx from "../../src/common/logger"; import { FindChartWithPTDF } from "../../src/common/database-lookup/chart"; -import { Difficulties } from "kamaitachi-common"; +import { Difficulties } from "tachi-common"; const logger = CreateLogCtx(__filename); diff --git a/server/scripts/set-indexes.ts b/server/scripts/set-indexes.ts index 2ce40d389..a95931524 100644 --- a/server/scripts/set-indexes.ts +++ b/server/scripts/set-indexes.ts @@ -2,8 +2,8 @@ import monk from "monk"; import { Command } from "commander"; import CreateLogCtx from "../src/lib/logger/logger"; import { IndexOptions } from "mongodb"; -import { ValidDatabases } from "kamaitachi-common"; -import { supportedGames } from "kamaitachi-common/js/config"; +import { ValidDatabases } from "tachi-common"; +import { supportedGames } from "tachi-common/js/config"; const logger = CreateLogCtx(__filename); diff --git a/server/scripts/single-use/fix-iidx-versions/fix-iidx-versions.ts b/server/scripts/single-use/fix-iidx-versions/fix-iidx-versions.ts index a11b4c26e..cb3fe5847 100644 --- a/server/scripts/single-use/fix-iidx-versions/fix-iidx-versions.ts +++ b/server/scripts/single-use/fix-iidx-versions/fix-iidx-versions.ts @@ -1,5 +1,5 @@ import db from "../../../src/db/db"; -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; db.charts.iidx .find({}) diff --git a/server/scripts/single-use/fix-legacy-folder-format.ts b/server/scripts/single-use/fix-legacy-folder-format.ts index f9de72411..a135bdbb4 100644 --- a/server/scripts/single-use/fix-legacy-folder-format.ts +++ b/server/scripts/single-use/fix-legacy-folder-format.ts @@ -1,11 +1,11 @@ import db from "../../src/db/db"; -import { FolderDocument } from "kamaitachi-common"; +import { FolderDocument } from "tachi-common"; (async () => { - let folders = (await db.folders.find({})) as any[]; + const folders = (await db.folders.find({})) as any[]; for (const fl of folders) { - let f: FolderDocument = { + const f: FolderDocument = { folderID: fl.folderID, game: fl.game, playtype: fl.playtype, diff --git a/server/scripts/update-bpi-poyashi.ts b/server/scripts/update-bpi-poyashi.ts index e03bb670a..318469fe5 100644 --- a/server/scripts/update-bpi-poyashi.ts +++ b/server/scripts/update-bpi-poyashi.ts @@ -3,7 +3,7 @@ import fetch from "node-fetch"; import { Command } from "commander"; import fs from "fs"; import path from "path"; -import { config, Difficulties, ESDCore, IIDXBPIData, ChartDocument } from "kamaitachi-common"; +import { config, Difficulties, ESDCore, IIDXBPIData, ChartDocument } from "tachi-common"; import { FindSongOnTitle } from "../src/score-import/database-lookup/song-title"; import { FindChartWithPTDF, diff --git a/server/scripts/validate-database.ts b/server/scripts/validate-database.ts index 745dfd322..1ff84721f 100644 --- a/server/scripts/validate-database.ts +++ b/server/scripts/validate-database.ts @@ -5,7 +5,7 @@ import CreateLogCtx from "../src/common/logger"; import fs from "fs"; import path from "path"; import { PrudenceError } from "prudence/js/error"; -import { supportedGames, validPlaytypes } from "kamaitachi-common/js/config"; +import { supportedGames, validPlaytypes } from "tachi-common/js/config"; const BASE_DIR = path.join(__dirname, "./validate-database-errs"); diff --git a/server/src/external/mongo/db.ts b/server/src/external/mongo/db.ts index 2d0c35c66..998ad7c7c 100644 --- a/server/src/external/mongo/db.ts +++ b/server/src/external/mongo/db.ts @@ -24,7 +24,7 @@ import { PBScoreDocument, UserMilestoneDocument, BMSCourseDocument, -} from "kamaitachi-common"; +} from "tachi-common"; import monk from "monk"; import { MONGO_BASE_URL } from "../../lib/env/env"; import CreateLogCtx from "../../lib/logger/logger"; diff --git a/server/src/external/mongo/schemas.ts b/server/src/external/mongo/schemas.ts index 122a37844..a7fc2daf5 100644 --- a/server/src/external/mongo/schemas.ts +++ b/server/src/external/mongo/schemas.ts @@ -1,5 +1,5 @@ import deepmerge from "deepmerge"; -import { Game, Playtypes } from "kamaitachi-common"; +import { Game, Playtypes } from "tachi-common"; import { grades, importTypes, @@ -8,7 +8,7 @@ import { validDifficulties, validPlaytypes, supportedGames, -} from "kamaitachi-common/js/config"; +} from "tachi-common/js/config"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; const LAZY_EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/u; diff --git a/server/src/external/redis/redis-IPC.ts b/server/src/external/redis/redis-IPC.ts index 51e129ff4..768c149bc 100644 --- a/server/src/external/redis/redis-IPC.ts +++ b/server/src/external/redis/redis-IPC.ts @@ -1,5 +1,5 @@ import redis from "redis"; -import { RedisIPCChannels, RedisIPCData } from "kamaitachi-common"; +import { RedisIPCChannels, RedisIPCData } from "tachi-common"; import CreateLogCtx from "../../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/lib/score-import/framework/calculated-data/calculated-data.ts b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts index dcb134d1b..600df1d18 100644 --- a/server/src/lib/score-import/framework/calculated-data/calculated-data.ts +++ b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts @@ -7,7 +7,7 @@ import { Grades, Lamps, IDStrings, -} from "kamaitachi-common"; +} from "tachi-common"; import db from "../../../../external/mongo/db"; import { HasOwnProperty } from "../../../../utils/misc"; diff --git a/server/src/lib/score-import/framework/calculated-data/stats.test.ts b/server/src/lib/score-import/framework/calculated-data/stats.test.ts index 06e182abf..0a2a355ae 100644 --- a/server/src/lib/score-import/framework/calculated-data/stats.test.ts +++ b/server/src/lib/score-import/framework/calculated-data/stats.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db from "../../../../external/mongo/db"; -import { AnyChartDocument, Difficulties, Lamps, ScoreDocument } from "kamaitachi-common"; +import { AnyChartDocument, Difficulties, Lamps, ScoreDocument } from "tachi-common"; import { CalculateBPI, CalculateCHUNITHMRating, diff --git a/server/src/lib/score-import/framework/calculated-data/stats.ts b/server/src/lib/score-import/framework/calculated-data/stats.ts index 9aa5e4f94..0a6e0ca85 100644 --- a/server/src/lib/score-import/framework/calculated-data/stats.ts +++ b/server/src/lib/score-import/framework/calculated-data/stats.ts @@ -6,12 +6,12 @@ import { Lamps, Game, Playtypes, -} from "kamaitachi-common"; +} from "tachi-common"; import db from "../../../../external/mongo/db"; import { GetAllTierlistDataOfType, GetOneTierlistData } from "../../../../utils/tierlist"; import { KtLogger } from "../../../logger/logger"; import { DryScore } from "../common/types"; -import { lamps, clearLamp, ratingParameters } from "kamaitachi-common/js/config"; +import { lamps, clearLamp, ratingParameters } from "tachi-common/js/config"; /** * Calculates the in-game CHUNITHM rating for a score. diff --git a/server/src/lib/score-import/framework/common/converter-failures.ts b/server/src/lib/score-import/framework/common/converter-failures.ts index bc2ee0064..dd1c75f02 100644 --- a/server/src/lib/score-import/framework/common/converter-failures.ts +++ b/server/src/lib/score-import/framework/common/converter-failures.ts @@ -1,7 +1,7 @@ // Various Errors that can occur during processing. // @todo #116 Resolve circular dependency between converter-failures.ts and import-types/common/types. -import { ImportTypes } from "kamaitachi-common"; +import { ImportTypes } from "tachi-common"; import { ImportTypeDataMap, ImportTypeContextMap } from "../../import-types/common/types"; export class ConverterFailure { diff --git a/server/src/lib/score-import/framework/common/import-logger.test.ts b/server/src/lib/score-import/framework/common/import-logger.test.ts index d357cd17b..67bcc3def 100644 --- a/server/src/lib/score-import/framework/common/import-logger.test.ts +++ b/server/src/lib/score-import/framework/common/import-logger.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import { CreateImportLoggerAndID } from "./import-logger"; -import { PublicUserDocument } from "kamaitachi-common"; +import { PublicUserDocument } from "tachi-common"; import { CloseAllConnections } from "../../../../test-utils/close-connections"; t.test("#CreateImportLoggerAndID", (t) => { diff --git a/server/src/lib/score-import/framework/common/import-logger.ts b/server/src/lib/score-import/framework/common/import-logger.ts index f000e7ffa..ac10b89ae 100644 --- a/server/src/lib/score-import/framework/common/import-logger.ts +++ b/server/src/lib/score-import/framework/common/import-logger.ts @@ -1,4 +1,4 @@ -import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; +import { ImportTypes, PublicUserDocument } from "tachi-common"; import crypto from "crypto"; import { FormatUserDoc } from "../../../../utils/user"; import { rootLogger, KtLogger } from "../../../logger/logger"; diff --git a/server/src/lib/score-import/framework/common/score-utils.ts b/server/src/lib/score-import/framework/common/score-utils.ts index 2a99b2b9f..725ff59c0 100644 --- a/server/src/lib/score-import/framework/common/score-utils.ts +++ b/server/src/lib/score-import/framework/common/score-utils.ts @@ -8,8 +8,8 @@ import { GameToIDStrings, ESDCore, Playtypes, -} from "kamaitachi-common"; -import { judgementWindows, gamePercentMax } from "kamaitachi-common/js/config"; +} from "tachi-common"; +import { judgementWindows, gamePercentMax } from "tachi-common/js/config"; import CreateLogCtx from "../../../logger/logger"; import { InternalFailure, InvalidScoreFailure } from "./converter-failures"; diff --git a/server/src/lib/score-import/framework/common/string-asserts.ts b/server/src/lib/score-import/framework/common/string-asserts.ts index e13356fc9..6a78f1c3f 100644 --- a/server/src/lib/score-import/framework/common/string-asserts.ts +++ b/server/src/lib/score-import/framework/common/string-asserts.ts @@ -1,6 +1,6 @@ import { InvalidScoreFailure } from "./converter-failures"; -import { Difficulties, Game, IDStrings, Playtypes } from "kamaitachi-common"; -import { validDifficulties } from "kamaitachi-common/js/config"; +import { Difficulties, Game, IDStrings, Playtypes } from "tachi-common"; +import { validDifficulties } from "tachi-common/js/config"; export function AssertStrAsDifficulty( strVal: string, diff --git a/server/src/lib/score-import/framework/common/types.ts b/server/src/lib/score-import/framework/common/types.ts index aa15fa3ed..b1eaa868c 100644 --- a/server/src/lib/score-import/framework/common/types.ts +++ b/server/src/lib/score-import/framework/common/types.ts @@ -1,4 +1,4 @@ -import { IDStrings, ScoreDocument, Playtypes, Game } from "kamaitachi-common"; +import { IDStrings, ScoreDocument, Playtypes, Game } from "tachi-common"; /** * An intermediate score format that will be filled out by diff --git a/server/src/lib/score-import/framework/express-wrapper.ts b/server/src/lib/score-import/framework/express-wrapper.ts index 4448e3a23..b6e693aa6 100644 --- a/server/src/lib/score-import/framework/express-wrapper.ts +++ b/server/src/lib/score-import/framework/express-wrapper.ts @@ -4,7 +4,7 @@ import { SuccessfulAPIResponse, UnsuccessfulAPIResponse, ImportDocument, -} from "kamaitachi-common"; +} from "tachi-common"; import { ImportInputParser } from "../import-types/common/types"; import { CreateImportLoggerAndID } from "./common/import-logger"; import ScoreImportMain from "./score-import-main"; diff --git a/server/src/lib/score-import/framework/goals/goals.test.ts b/server/src/lib/score-import/framework/goals/goals.test.ts index f04fbadad..d7f657dbd 100644 --- a/server/src/lib/score-import/framework/goals/goals.test.ts +++ b/server/src/lib/score-import/framework/goals/goals.test.ts @@ -2,7 +2,7 @@ import t from "tap"; import db from "../../../../external/mongo/db"; import ResetDBState from "../../../../test-utils/resets"; import { GetRelevantFolderGoals, GetRelevantGoals, UpdateGoalsForUser, ProcessGoal } from "./goals"; -import { GoalDocument, UserGoalDocument } from "kamaitachi-common"; +import { GoalDocument, UserGoalDocument } from "tachi-common"; import { CreateFolderChartLookup } from "../../../../utils/folder"; import { GetKTDataJSON, diff --git a/server/src/lib/score-import/framework/goals/goals.ts b/server/src/lib/score-import/framework/goals/goals.ts index d53917807..5a9cfeb56 100644 --- a/server/src/lib/score-import/framework/goals/goals.ts +++ b/server/src/lib/score-import/framework/goals/goals.ts @@ -1,4 +1,4 @@ -import { integer, Game, GoalDocument, UserGoalDocument } from "kamaitachi-common"; +import { integer, Game, GoalDocument, UserGoalDocument } from "tachi-common"; import { EvaluateGoalForUser } from "../../../../utils/goal"; import db from "../../../../external/mongo/db"; import { KtLogger } from "../../../logger/logger"; diff --git a/server/src/lib/score-import/framework/milestones/milestones.test.ts b/server/src/lib/score-import/framework/milestones/milestones.test.ts index 5f066f5de..2203a9a79 100644 --- a/server/src/lib/score-import/framework/milestones/milestones.test.ts +++ b/server/src/lib/score-import/framework/milestones/milestones.test.ts @@ -4,7 +4,7 @@ import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../../test-utils/resets"; import { TestingIIDXSPMilestone } from "../../../../test-utils/test-data"; import { UpdateUsersMilestones } from "./milestones"; -import { GoalImportInfo } from "kamaitachi-common"; +import { GoalImportInfo } from "tachi-common"; import deepmerge from "deepmerge"; import { CloseAllConnections } from "../../../../test-utils/close-connections"; diff --git a/server/src/lib/score-import/framework/milestones/milestones.ts b/server/src/lib/score-import/framework/milestones/milestones.ts index d574e3228..0aa708064 100644 --- a/server/src/lib/score-import/framework/milestones/milestones.ts +++ b/server/src/lib/score-import/framework/milestones/milestones.ts @@ -7,7 +7,7 @@ import { UserMilestoneDocument, MilestoneImportInfo, MilestoneDocument, -} from "kamaitachi-common"; +} from "tachi-common"; import db from "../../../../external/mongo/db"; import { BulkWriteUpdateOneOperation } from "mongodb"; import { CalculateMilestoneOutOf, GetGoalIDsFromMilestone } from "../../../../utils/milestone"; diff --git a/server/src/lib/score-import/framework/orphans/orphans.ts b/server/src/lib/score-import/framework/orphans/orphans.ts index d2d9ff5f1..6d4cc04b6 100644 --- a/server/src/lib/score-import/framework/orphans/orphans.ts +++ b/server/src/lib/score-import/framework/orphans/orphans.ts @@ -6,7 +6,7 @@ import { ImportTypeDataMap, OrphanScoreDocument, } from "../../import-types/common/types"; -import { ImportTypes, integer } from "kamaitachi-common"; +import { ImportTypes, integer } from "tachi-common"; import fjsh from "fast-json-stable-hash"; import { KtLogger } from "../../../logger/logger"; import { Converters } from "../../import-types/converters"; diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts index bd63087cc..ba53a0de9 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts @@ -6,7 +6,7 @@ import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; import CreateLogCtx, { KtLogger } from "../../../logger/logger"; -import { lamps } from "kamaitachi-common/js/config"; +import { lamps } from "tachi-common/js/config"; import { CloseAllConnections } from "../../../../test-utils/close-connections"; let IIDXScore = TestingIIDXSPScore; diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.ts index 9861fa43c..d72a92a17 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.ts @@ -1,5 +1,5 @@ import db from "../../../../external/mongo/db"; -import { integer, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; +import { integer, PBScoreDocument, ScoreDocument } from "tachi-common"; import { KtLogger } from "../../../logger/logger"; import { IIDXMergeFn, SDVXMergeFn } from "./game-specific-merge"; diff --git a/server/src/lib/score-import/framework/pb/game-specific-merge.ts b/server/src/lib/score-import/framework/pb/game-specific-merge.ts index 39668847b..e099542c5 100644 --- a/server/src/lib/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/lib/score-import/framework/pb/game-specific-merge.ts @@ -1,4 +1,4 @@ -import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; +import { PBScoreDocument, ScoreDocument } from "tachi-common"; import { FindChartWithChartID } from "../../../../utils/queries/charts"; import db from "../../../../external/mongo/db"; import { KtLogger } from "../../../logger/logger"; diff --git a/server/src/lib/score-import/framework/pb/process-pbs.ts b/server/src/lib/score-import/framework/pb/process-pbs.ts index efb4d9f46..1d183396f 100644 --- a/server/src/lib/score-import/framework/pb/process-pbs.ts +++ b/server/src/lib/score-import/framework/pb/process-pbs.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; import db from "../../../../external/mongo/db"; import { KtLogger } from "../../../logger/logger"; import { CreatePBDoc, UpdateChartRanking, PBScoreDocumentNoRank } from "./create-pb-doc"; 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 9836877b3..68cf0ca1d 100644 --- a/server/src/lib/score-import/framework/score-import-main.ts +++ b/server/src/lib/score-import/framework/score-import-main.ts @@ -7,7 +7,7 @@ import { Game, integer, IDStrings, -} from "kamaitachi-common"; +} from "tachi-common"; import { KtLogger } from "../../logger/logger"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; 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 c80802c47..f5414e0c3 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 @@ -4,7 +4,7 @@ import { integer, ScoreDocument, AnySongDocument, -} from "kamaitachi-common"; +} 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/score-importing/insert-score.test.ts b/server/src/lib/score-import/framework/score-importing/insert-score.test.ts index 1f7104e00..5356b493c 100644 --- a/server/src/lib/score-import/framework/score-importing/insert-score.test.ts +++ b/server/src/lib/score-import/framework/score-importing/insert-score.test.ts @@ -1,4 +1,4 @@ -import { ScoreDocument } from "kamaitachi-common"; +import { ScoreDocument } from "tachi-common"; import t from "tap"; import db from "../../../../external/mongo/db"; import { CloseAllConnections } from "../../../../test-utils/close-connections"; diff --git a/server/src/lib/score-import/framework/score-importing/insert-score.ts b/server/src/lib/score-import/framework/score-importing/insert-score.ts index 8c6502153..376db5978 100644 --- a/server/src/lib/score-import/framework/score-importing/insert-score.ts +++ b/server/src/lib/score-import/framework/score-importing/insert-score.ts @@ -1,4 +1,4 @@ -import { ScoreDocument } from "kamaitachi-common"; +import { ScoreDocument } from "tachi-common"; import db from "../../../../external/mongo/db"; import CreateLogCtx from "../../../logger/logger"; diff --git a/server/src/lib/score-import/framework/score-importing/score-id.test.ts b/server/src/lib/score-import/framework/score-importing/score-id.test.ts index 832b9f724..2a6bdb9f1 100644 --- a/server/src/lib/score-import/framework/score-importing/score-id.test.ts +++ b/server/src/lib/score-import/framework/score-importing/score-id.test.ts @@ -1,4 +1,4 @@ -import { ScoreDocument } from "kamaitachi-common"; +import { ScoreDocument } from "tachi-common"; import t from "tap"; import { CloseAllConnections } from "../../../../test-utils/close-connections"; import ResetDBState from "../../../../test-utils/resets"; diff --git a/server/src/lib/score-import/framework/score-importing/score-id.ts b/server/src/lib/score-import/framework/score-importing/score-id.ts index 6ec102b1c..b4df536fa 100644 --- a/server/src/lib/score-import/framework/score-importing/score-id.ts +++ b/server/src/lib/score-import/framework/score-importing/score-id.ts @@ -1,6 +1,6 @@ import crypto from "crypto"; import db from "../../../../external/mongo/db"; -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; import { DryScore } from "../common/types"; function CreateScoreIDString(userID: integer, partialScore: DryScore, chartID: string) { diff --git a/server/src/lib/score-import/framework/score-importing/score-importing.ts b/server/src/lib/score-import/framework/score-importing/score-importing.ts index 24de7ce32..2e5d1ce62 100644 --- a/server/src/lib/score-import/framework/score-importing/score-importing.ts +++ b/server/src/lib/score-import/framework/score-importing/score-importing.ts @@ -6,7 +6,7 @@ import { AnySongDocument, ImportTypes, IDStrings, -} from "kamaitachi-common"; +} from "tachi-common"; import { HydrateScore } from "./hydrate-score"; import { InsertQueue, QueueScoreInsert, ScoreIDs } from "./insert-score"; import { diff --git a/server/src/lib/score-import/framework/sessions/calculated-data.ts b/server/src/lib/score-import/framework/sessions/calculated-data.ts index 9976022c0..75ce6b1f1 100644 --- a/server/src/lib/score-import/framework/sessions/calculated-data.ts +++ b/server/src/lib/score-import/framework/sessions/calculated-data.ts @@ -1,4 +1,4 @@ -import { ScoreDocument, SessionDocument, Game, Playtypes } from "kamaitachi-common"; +import { ScoreDocument, SessionDocument, Game, Playtypes } from "tachi-common"; type ScoreCalculatedDataOnly = Pick; diff --git a/server/src/lib/score-import/framework/sessions/sessions.test.ts b/server/src/lib/score-import/framework/sessions/sessions.test.ts index 161eb8f69..3fbf862c9 100644 --- a/server/src/lib/score-import/framework/sessions/sessions.test.ts +++ b/server/src/lib/score-import/framework/sessions/sessions.test.ts @@ -5,7 +5,7 @@ import ResetDBState from "../../../../test-utils/resets"; import { TestingIIDXSPScore, TestingIIDXSPScorePB } from "../../../../test-utils/test-data"; import { CreateScoreLogger } from "../common/import-logger"; import { CreateSessions, LoadScoresIntoSessions } from "./sessions"; -import { PublicUserDocument, ScoreDocument, SessionDocument } from "kamaitachi-common"; +import { PublicUserDocument, ScoreDocument, SessionDocument } from "tachi-common"; import deepmerge from "deepmerge"; const logger = CreateScoreLogger( diff --git a/server/src/lib/score-import/framework/sessions/sessions.ts b/server/src/lib/score-import/framework/sessions/sessions.ts index 314747590..dee709bb5 100644 --- a/server/src/lib/score-import/framework/sessions/sessions.ts +++ b/server/src/lib/score-import/framework/sessions/sessions.ts @@ -8,7 +8,7 @@ import { SessionScoreInfo, SessionInfoReturn, Game, -} from "kamaitachi-common"; +} from "tachi-common"; import db from "../../../../external/mongo/db"; import { AppendLogCtx, KtLogger } from "../../../logger/logger"; import { GenerateRandomSessionName } from "./name-generation"; diff --git a/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts b/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts index ed1de66a2..844b7a01e 100644 --- a/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts +++ b/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts @@ -1,5 +1,5 @@ -import { Game, Playtypes, integer, ScoreCalculatedDataLookup } from "kamaitachi-common"; -import { GameClasses } from "kamaitachi-common/js/game-classes"; +import { Game, Playtypes, integer, ScoreCalculatedDataLookup } from "tachi-common"; +import { GameClasses } from "tachi-common/js/game-classes"; import { GitadoraColours, SDVXVFClasses } from "../../../constants/classes"; import { KtLogger } from "../../../logger/logger"; diff --git a/server/src/lib/score-import/framework/user-game-stats/classes.test.ts b/server/src/lib/score-import/framework/user-game-stats/classes.test.ts index a9e1a2471..ef2adb87b 100644 --- a/server/src/lib/score-import/framework/user-game-stats/classes.test.ts +++ b/server/src/lib/score-import/framework/user-game-stats/classes.test.ts @@ -1,4 +1,4 @@ -import { UserGameStats } from "kamaitachi-common"; +import { UserGameStats } from "tachi-common"; import t from "tap"; import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../../test-utils/resets"; diff --git a/server/src/lib/score-import/framework/user-game-stats/classes.ts b/server/src/lib/score-import/framework/user-game-stats/classes.ts index 7c542f3a3..9d2cc9dc2 100644 --- a/server/src/lib/score-import/framework/user-game-stats/classes.ts +++ b/server/src/lib/score-import/framework/user-game-stats/classes.ts @@ -1,5 +1,5 @@ -import { Game, Playtypes, integer, UserGameStats, ClassDelta, IDStrings } from "kamaitachi-common"; -import { GameClasses } from "kamaitachi-common/js/game-classes"; +import { Game, Playtypes, integer, UserGameStats, ClassDelta, IDStrings } from "tachi-common"; +import { GameClasses } from "tachi-common/js/game-classes"; import deepmerge from "deepmerge"; import { KtLogger } from "../../../logger/logger"; import { diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.ts b/server/src/lib/score-import/framework/user-game-stats/rating.ts index b6c4da465..65f12da5f 100644 --- a/server/src/lib/score-import/framework/user-game-stats/rating.ts +++ b/server/src/lib/score-import/framework/user-game-stats/rating.ts @@ -5,7 +5,7 @@ import { ScoreCalculatedDataLookup, IDStrings, UserGameStats, -} from "kamaitachi-common"; +} from "tachi-common"; import db from "../../../../external/mongo/db"; import { KtLogger } from "../../../logger/logger"; diff --git a/server/src/lib/score-import/framework/user-game-stats/types.ts b/server/src/lib/score-import/framework/user-game-stats/types.ts index ef7fbae00..eb562a04e 100644 --- a/server/src/lib/score-import/framework/user-game-stats/types.ts +++ b/server/src/lib/score-import/framework/user-game-stats/types.ts @@ -1,5 +1,5 @@ -import { Game, Playtypes, integer, IDStrings } from "kamaitachi-common"; -import { GameClasses } from "kamaitachi-common/js/game-classes"; +import { Game, Playtypes, integer, IDStrings } from "tachi-common"; +import { GameClasses } from "tachi-common/js/game-classes"; import { KtLogger } from "../../../logger/logger"; diff --git a/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts index 06739e710..0d9f92894 100644 --- a/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/lib/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, ClassDelta } from "kamaitachi-common"; +import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "tachi-common"; import db from "../../../../external/mongo/db"; import { KtLogger } from "../../../logger/logger"; import { CalculateClassDeltas, UpdateUGSClasses } from "./classes"; diff --git a/server/src/lib/score-import/import-types/api/arc-ddr/converter.ts b/server/src/lib/score-import/import-types/api/arc-ddr/converter.ts index e44e78015..ded9f42b9 100644 --- a/server/src/lib/score-import/import-types/api/arc-ddr/converter.ts +++ b/server/src/lib/score-import/import-types/api/arc-ddr/converter.ts @@ -14,7 +14,7 @@ import { GenericGetGradeAndPercent, ParseDateFromString, } from "../../../framework/common/score-utils"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; // There's a bunch of other useless fields but we don't care const PR_ArcDDRScore: PrudenceSchema = { diff --git a/server/src/lib/score-import/import-types/api/arc-ddr/types.ts b/server/src/lib/score-import/import-types/api/arc-ddr/types.ts index dad38d75c..feae029c7 100644 --- a/server/src/lib/score-import/import-types/api/arc-ddr/types.ts +++ b/server/src/lib/score-import/import-types/api/arc-ddr/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface ARCDDRScore { chart_id: string; diff --git a/server/src/lib/score-import/import-types/api/arc-iidx/converter.ts b/server/src/lib/score-import/import-types/api/arc-iidx/converter.ts index ed9763a85..dfc704832 100644 --- a/server/src/lib/score-import/import-types/api/arc-iidx/converter.ts +++ b/server/src/lib/score-import/import-types/api/arc-iidx/converter.ts @@ -14,7 +14,7 @@ import { GenericGetGradeAndPercent, ParseDateFromString, } from "../../../framework/common/score-utils"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; // There's a bunch of other useless fields but we don't care const PR_ArcIIDXScore: PrudenceSchema = { diff --git a/server/src/lib/score-import/import-types/api/arc-iidx/types.ts b/server/src/lib/score-import/import-types/api/arc-iidx/types.ts index 51f709c1b..f6d8d1c04 100644 --- a/server/src/lib/score-import/import-types/api/arc-iidx/types.ts +++ b/server/src/lib/score-import/import-types/api/arc-iidx/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface ARCIIDXScore { chart_id: string; diff --git a/server/src/lib/score-import/import-types/api/arc-sdvx/converter.ts b/server/src/lib/score-import/import-types/api/arc-sdvx/converter.ts index 3a966e991..ef7fc687f 100644 --- a/server/src/lib/score-import/import-types/api/arc-sdvx/converter.ts +++ b/server/src/lib/score-import/import-types/api/arc-sdvx/converter.ts @@ -14,7 +14,7 @@ import { GenericGetGradeAndPercent, ParseDateFromString, } from "../../../framework/common/score-utils"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; // There's a bunch of other useless fields but we don't care const PR_ArcSDVXScore: PrudenceSchema = { diff --git a/server/src/lib/score-import/import-types/api/arc-sdvx/types.ts b/server/src/lib/score-import/import-types/api/arc-sdvx/types.ts index 40374e00c..c62eae190 100644 --- a/server/src/lib/score-import/import-types/api/arc-sdvx/types.ts +++ b/server/src/lib/score-import/import-types/api/arc-sdvx/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface ARCSDVXScore { chart_id: string; diff --git a/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts index 1ad5240a7..2fb4a4c81 100644 --- a/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts @@ -1,6 +1,6 @@ import { KtLogger } from "../../../../logger/logger"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; -import { KaiAuthDocument } from "kamaitachi-common"; +import { KaiAuthDocument } from "tachi-common"; export function ParseEagIIDX(authDoc: KaiAuthDocument, logger: KtLogger) { return ParseKaiIIDX("EAG", authDoc, logger); diff --git a/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts index 95c011688..9b6971855 100644 --- a/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts @@ -1,5 +1,5 @@ import { KtLogger } from "../../../../logger/logger"; -import { KaiAuthDocument } from "kamaitachi-common"; +import { KaiAuthDocument } from "tachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; export function ParseEagSDVX(authDoc: KaiAuthDocument, logger: KtLogger) { diff --git a/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts index 65c5560b7..f57eb2c95 100644 --- a/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts @@ -1,6 +1,6 @@ import { KtLogger } from "../../../../logger/logger"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; -import { KaiAuthDocument } from "kamaitachi-common"; +import { KaiAuthDocument } from "tachi-common"; export function ParseFloIIDX(authDoc: KaiAuthDocument, logger: KtLogger) { return ParseKaiIIDX("FLO", authDoc, logger); diff --git a/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts index 3be7d3dec..22e39f92e 100644 --- a/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts @@ -1,5 +1,5 @@ import { KtLogger } from "../../../../logger/logger"; -import { KaiAuthDocument } from "kamaitachi-common"; +import { KaiAuthDocument } from "tachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; export function ParseFloSDVX(authDoc: KaiAuthDocument, logger: KtLogger) { 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 5a352b951..0c575566f 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 @@ -12,7 +12,7 @@ import { GenericGetGradeAndPercent, ParseDateFromString, } from "../../../../framework/common/score-utils"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; import { ConverterFunction } from "../../types"; import { DryScore } from "../../../../framework/common/types"; 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 fa09be37e..5f423474c 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 @@ -1,6 +1,6 @@ import { KtLogger } from "../../../../../logger/logger"; import nodeFetch from "../../../../../../utils/fetch"; -import { KaiAuthDocument } from "kamaitachi-common"; +import { KaiAuthDocument } from "tachi-common"; import { KaiContext } from "../types"; import { TraverseKaiAPI } from "../traverse-api"; import { ParserFunctionReturnsAsync } from "../../types"; diff --git a/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts index 8fe04584b..b5d4d64b6 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts @@ -12,7 +12,7 @@ import { GenericGetGradeAndPercent, ParseDateFromString, } from "../../../../framework/common/score-utils"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; import { ConverterFunction } from "../../types"; import { DryScore } from "../../../../framework/common/types"; 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 5305d56b4..01e12951b 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 @@ -1,6 +1,6 @@ import { KtLogger } from "../../../../../logger/logger"; import nodeFetch from "../../../../../../utils/fetch"; -import { KaiAuthDocument } from "kamaitachi-common"; +import { KaiAuthDocument } from "tachi-common"; import { KaiContext } from "../types"; import { TraverseKaiAPI } from "../traverse-api"; import { ParserFunctionReturnsAsync } from "../../types"; diff --git a/server/src/lib/score-import/import-types/common/api-kai/types.ts b/server/src/lib/score-import/import-types/common/api-kai/types.ts index 07f9cddbd..e145ed120 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/types.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface KaiIIDXScore { music_id: integer; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts index 00d60a67f..1c674a86e 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts @@ -4,7 +4,7 @@ import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../tes import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; import { EscapeStringRegexp } from "../../../../../utils/misc"; -import { Game } from "kamaitachi-common"; +import { Game } from "tachi-common"; import ResetDBState from "../../../../../test-utils/resets"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { CloseAllConnections } from "../../../../../test-utils/close-connections"; 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 0e030fc96..7eaedb4f9 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 @@ -1,5 +1,5 @@ import { BatchManualContext, BatchManualScore } from "./types"; -import { AnyChartDocument, AnySongDocument, ImportTypes } from "kamaitachi-common"; +import { AnyChartDocument, AnySongDocument, ImportTypes } from "tachi-common"; import { InternalFailure, InvalidScoreFailure, 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 ed8e881dc..addfeaefd 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,8 +2,8 @@ import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; -import { lamps, supportedGames, validHitData, validPlaytypes } from "kamaitachi-common/js/config"; -import { Game, ImportTypes } from "kamaitachi-common"; +import { lamps, supportedGames, 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"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/types.ts b/server/src/lib/score-import/import-types/common/batch-manual/types.ts index bd567be85..0e37cecb9 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/types.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/types.ts @@ -1,4 +1,4 @@ -import { Game, Playtypes, Lamps, IDStrings } from "kamaitachi-common"; +import { Game, Playtypes, Lamps, IDStrings } from "tachi-common"; export type BatchManualScore = { score: number; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts index c09ed7b80..7655ee737 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts @@ -1,4 +1,4 @@ -import { Lamps, ChartDocument } from "kamaitachi-common"; +import { Lamps, ChartDocument } from "tachi-common"; import { FindChartWithPTDFVersion } from "../../../../../utils/queries/charts"; import { FindSongOnTitle } from "../../../../../utils/queries/songs"; import { 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 6d29f4ba7..9166196e6 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,4 +1,4 @@ -import { Difficulties } from "kamaitachi-common"; +import { Difficulties } from "tachi-common"; import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../types"; 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 f916ae924..9c5b53a1d 100644 --- a/server/src/lib/score-import/import-types/common/types.ts +++ b/server/src/lib/score-import/import-types/common/types.ts @@ -15,7 +15,7 @@ import { AnySongDocument, integer, MongoDBDocument, -} from "kamaitachi-common"; +} from "tachi-common"; import { ConverterFailure } from "../../framework/common/converter-failures"; import { DryScore } from "../../framework/common/types"; import { BeatorajaContext, BeatorajaScore } from "../ir/beatoraja/types"; diff --git a/server/src/lib/score-import/import-types/converters.ts b/server/src/lib/score-import/import-types/converters.ts index fa94c35aa..e96f23c77 100644 --- a/server/src/lib/score-import/import-types/converters.ts +++ b/server/src/lib/score-import/import-types/converters.ts @@ -1,4 +1,4 @@ -import { ImportTypes } from "kamaitachi-common"; +import { ImportTypes } from "tachi-common"; import { ConvertAPIArcDDR } from "./api/arc-ddr/converter"; import { ConvertAPIArcIIDX } from "./api/arc-iidx/converter"; import { ConvertAPIArcSDVX } from "./api/arc-sdvx/converter"; diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts b/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts index e7d8435de..d0f19f009 100644 --- a/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts @@ -10,7 +10,7 @@ import { ParseDateFromString, } from "../../../framework/common/score-utils"; import { MerScore } from "./types"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction } from "../../common/types"; diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/types.ts b/server/src/lib/score-import/import-types/file/mer-iidx/types.ts index 2c3772252..914a79621 100644 --- a/server/src/lib/score-import/import-types/file/mer-iidx/types.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface MerScore { music_id: integer; diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts index 8a46d2616..f601334b3 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts @@ -6,7 +6,7 @@ import { SkipScoreFailure, } from "../../../framework/common/converter-failures"; import { S3Score } from "./types"; -import { Playtypes, Difficulties, Grades, Lamps } from "kamaitachi-common"; +import { Playtypes, Difficulties, Grades, Lamps } from "tachi-common"; import { FindSongOnTitleInsensitive } from "../../../../../utils/queries/songs"; import { FindChartWithPTDFVersion } from "../../../../../utils/queries/charts"; import { diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/types.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/types.ts index a16781316..2879ca18d 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/types.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface S3Score { id: integer; diff --git a/server/src/lib/score-import/import-types/ir/barbatos/converter.ts b/server/src/lib/score-import/import-types/ir/barbatos/converter.ts index 981198327..aa1abaf48 100644 --- a/server/src/lib/score-import/import-types/ir/barbatos/converter.ts +++ b/server/src/lib/score-import/import-types/ir/barbatos/converter.ts @@ -7,7 +7,7 @@ import { KTDataNotFoundFailure, } from "../../../framework/common/converter-failures"; import { BarbatosScore } from "./types"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction } from "../../common/types"; diff --git a/server/src/lib/score-import/import-types/ir/barbatos/types.ts b/server/src/lib/score-import/import-types/ir/barbatos/types.ts index 2a5664231..7953888a4 100644 --- a/server/src/lib/score-import/import-types/ir/barbatos/types.ts +++ b/server/src/lib/score-import/import-types/ir/barbatos/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface BarbatosScore { difficulty: 0 | 1 | 2 | 3 | 4; 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 bdd42581e..8c0780da2 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 @@ -8,7 +8,7 @@ import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils import { DryScore } from "../../../framework/common/types"; import { ConverterFunction } from "../../common/types"; import { BeatorajaContext, BeatorajaScore } from "./types"; -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; const LAMP_LOOKUP = { NoPlay: "NO PLAY", 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 4d8675bd9..ad054b39d 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 @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface BeatorajaContext { client: "beatoraja" | "lr2oraja"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts index c3baf0edb..89e512f81 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; import { ClassHandler } from "../../../framework/user-game-stats/types"; export function CreateFerStaticClassHandler(body: Record): ClassHandler { diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/converter.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/converter.ts index 5b8fb5733..4d2779952 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex-static/converter.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/converter.ts @@ -4,7 +4,7 @@ import { InternalFailure, KTDataNotFoundFailure, } from "../../../framework/common/converter-failures"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; import { FindChartOnInGameIDVersion } from "../../../../../utils/queries/charts"; import { FervidexStaticContext, FervidexStaticScore } from "./types"; import { FERVIDEX_LAMP_LOOKUP, SplitFervidexChartRef } from "../fervidex/converter"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/types.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/types.ts index 3dcd22ae5..05dd351dd 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex-static/types.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface FervidexStaticScore { clear_type: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7; diff --git a/server/src/lib/score-import/import-types/ir/fervidex/converter.ts b/server/src/lib/score-import/import-types/ir/fervidex/converter.ts index 186d6b226..0031b71dd 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/converter.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/converter.ts @@ -6,7 +6,7 @@ import { KTDataNotFoundFailure, } from "../../../framework/common/converter-failures"; import { FervidexContext, FervidexScore } from "./types"; -import { Lamps, Difficulties, Playtypes } from "kamaitachi-common"; +import { Lamps, Difficulties, Playtypes } from "tachi-common"; import { FindIIDXChartOnInGameIDVersion, FindIIDXChartWith2DXtraHash, diff --git a/server/src/lib/score-import/import-types/ir/fervidex/types.ts b/server/src/lib/score-import/import-types/ir/fervidex/types.ts index 7f3e19515..33df39923 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/types.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface FervidexScore { chart: `${"sp" | "dp"}${"b" | "n" | "h" | "a" | "l"}`; diff --git a/server/src/lib/score-import/import-types/ir/usc/converter.ts b/server/src/lib/score-import/import-types/ir/usc/converter.ts index 5f2d32b22..b037580f0 100644 --- a/server/src/lib/score-import/import-types/ir/usc/converter.ts +++ b/server/src/lib/score-import/import-types/ir/usc/converter.ts @@ -4,7 +4,7 @@ import { KtLogger } from "../../../../logger/logger"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { IRUSCContext } from "./types"; -import { Lamps } from "kamaitachi-common"; +import { Lamps } from "tachi-common"; import { ConverterFunction } from "../../common/types"; import { DryScore } from "../../../framework/common/types"; import { 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 c139b1d72..a7d0add6b 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 @@ -1,5 +1,5 @@ import { KtLogger } from "../../../../logger/logger"; -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; import p, { PrudenceSchema } from "prudence"; import { FormatPrError } from "../../../../../utils/prudence"; import { USCClientScore } from "../../../../../server/router/ir/usc/types"; diff --git a/server/src/lib/score-import/import-types/ir/usc/types.ts b/server/src/lib/score-import/import-types/ir/usc/types.ts index 3125753a7..3d74db04b 100644 --- a/server/src/lib/score-import/import-types/ir/usc/types.ts +++ b/server/src/lib/score-import/import-types/ir/usc/types.ts @@ -1,4 +1,4 @@ -import { ChartDocument } from "kamaitachi-common"; +import { ChartDocument } from "tachi-common"; export interface IRUSCContext { chart: ChartDocument<"usc:Single">; diff --git a/server/src/server/middleware/multer-upload.ts b/server/src/server/middleware/multer-upload.ts index a07104334..3f5b1caa3 100644 --- a/server/src/server/middleware/multer-upload.ts +++ b/server/src/server/middleware/multer-upload.ts @@ -3,7 +3,7 @@ import { RequestHandler } from "express"; import multer, { MulterError } from "multer"; import CreateLogCtx from "../../lib/logger/logger"; -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; import { SIXTEEN_MEGABTYES } from "../../lib/constants/filesize"; const defaultLogger = CreateLogCtx(__filename); diff --git a/server/src/server/router/api/v1/auth/auth.ts b/server/src/server/router/api/v1/auth/auth.ts index df7d9de80..e79dfd74f 100644 --- a/server/src/server/router/api/v1/auth/auth.ts +++ b/server/src/server/router/api/v1/auth/auth.ts @@ -5,7 +5,7 @@ import { PrivateUserDocument, PublicAPIKeyDocument, PublicUserDocument, -} from "kamaitachi-common"; +} from "tachi-common"; import { InsertResult } from "monk"; import db from "../../../../../external/mongo/db"; import { GetNextCounterValue } from "../../../../../utils/db"; diff --git a/server/src/server/router/api/v1/import/router.ts b/server/src/server/router/api/v1/import/router.ts index 90ce3da33..0a4165d83 100644 --- a/server/src/server/router/api/v1/import/router.ts +++ b/server/src/server/router/api/v1/import/router.ts @@ -1,6 +1,6 @@ import { Router } from "express"; -import { FileUploadImportTypes } from "kamaitachi-common"; -import { fileImportTypes } from "kamaitachi-common/js/config"; +import { FileUploadImportTypes } from "tachi-common"; +import { fileImportTypes } from "tachi-common/js/config"; import Prudence from "prudence"; import { GetUserWithIDGuaranteed } from "../../../../../utils/user"; import CreateLogCtx, { KtLogger } from "../../../../../lib/logger/logger"; diff --git a/server/src/server/router/ir/beatoraja/auth.ts b/server/src/server/router/ir/beatoraja/auth.ts index 21fdd8636..9b8192e27 100644 --- a/server/src/server/router/ir/beatoraja/auth.ts +++ b/server/src/server/router/ir/beatoraja/auth.ts @@ -1,4 +1,4 @@ -import { GenericAuthDocument } from "kamaitachi-common"; +import { GenericAuthDocument } from "tachi-common"; import { RequestHandler } from "express"; import db from "../../../../external/mongo/db"; import { SplitAuthorizationHeader } from "../../../../utils/misc"; diff --git a/server/src/server/router/ir/beatoraja/charts/convert-scores.test.ts b/server/src/server/router/ir/beatoraja/charts/convert-scores.test.ts index aef162dad..b869942c4 100644 --- a/server/src/server/router/ir/beatoraja/charts/convert-scores.test.ts +++ b/server/src/server/router/ir/beatoraja/charts/convert-scores.test.ts @@ -3,7 +3,7 @@ import db from "../../../../../external/mongo/db"; import ResetDBState from "../../../../../test-utils/resets"; import { GetKTDataJSON } from "../../../../../test-utils/test-data"; import { KtchiPBScoreToBeatorajaFormat } from "./convert-scores"; -import { ScoreDocument, PBScoreDocument } from "kamaitachi-common"; +import { ScoreDocument, PBScoreDocument } from "tachi-common"; import { Random20Hex } from "../../../../../utils/misc"; import deepmerge from "deepmerge"; import { CloseAllConnections } from "../../../../../test-utils/close-connections"; diff --git a/server/src/server/router/ir/beatoraja/charts/convert-scores.ts b/server/src/server/router/ir/beatoraja/charts/convert-scores.ts index 226391204..2944cfa12 100644 --- a/server/src/server/router/ir/beatoraja/charts/convert-scores.ts +++ b/server/src/server/router/ir/beatoraja/charts/convert-scores.ts @@ -1,4 +1,4 @@ -import { PBScoreDocument, integer, ScoreDocument, ChartDocument } from "kamaitachi-common"; +import { PBScoreDocument, integer, ScoreDocument, ChartDocument } from "tachi-common"; import db from "../../../../../external/mongo/db"; import CreateLogCtx from "../../../../../lib/logger/logger"; import { GetUsernameFromUserID } from "../../../../../utils/user"; diff --git a/server/src/server/router/ir/beatoraja/charts/router.ts b/server/src/server/router/ir/beatoraja/charts/router.ts index 5f640fad8..4bcad3315 100644 --- a/server/src/server/router/ir/beatoraja/charts/router.ts +++ b/server/src/server/router/ir/beatoraja/charts/router.ts @@ -1,4 +1,4 @@ -import { ChartDocument, PBScoreDocument } from "kamaitachi-common"; +import { ChartDocument, PBScoreDocument } from "tachi-common"; import { Router, RequestHandler } from "express"; import db from "../../../../../external/mongo/db"; import { SYMBOL_KtchiData } from "../../../../../lib/constants/ktchi"; diff --git a/server/src/server/router/ir/fervidex/router.ts b/server/src/server/router/ir/fervidex/router.ts index dc8defbda..c9e4b03f0 100644 --- a/server/src/server/router/ir/fervidex/router.ts +++ b/server/src/server/router/ir/fervidex/router.ts @@ -7,7 +7,7 @@ import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { ParseFervidexStatic } from "../../../../lib/score-import/import-types/ir/fervidex-static/parser"; import { ParseFervidexSingle } from "../../../../lib/score-import/import-types/ir/fervidex/parser"; -import { Playtypes, integer } from "kamaitachi-common"; +import { Playtypes, integer } from "tachi-common"; import CreateLogCtx from "../../../../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/usc/router.test.ts b/server/src/server/router/ir/usc/router.test.ts index b49043b3c..a2e320ce7 100644 --- a/server/src/server/router/ir/usc/router.test.ts +++ b/server/src/server/router/ir/usc/router.test.ts @@ -4,7 +4,7 @@ import { CloseAllConnections } from "../../../../test-utils/close-connections"; import mockApi from "../../../../test-utils/mock-api"; import ResetDBState, { ResetCDN } from "../../../../test-utils/resets"; import deepmerge from "deepmerge"; -import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; +import { PBScoreDocument, ScoreDocument } from "tachi-common"; import { GetKTDataBuffer } from "../../../../test-utils/test-data"; import { RetrieveCDN } from "../../../../lib/cdn/cdn"; diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index bf2db9de1..766f83a81 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -7,7 +7,7 @@ import { PBScoreDocument, SuccessfulAPIResponse, ImportDocument, -} from "kamaitachi-common"; +} from "tachi-common"; import { AssertStrAsPositiveNonZeroInt } from "../../../../lib/score-import/framework/common/string-asserts"; import CreateLogCtx, { KtLogger } from "../../../../lib/logger/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; diff --git a/server/src/server/router/ir/usc/types.ts b/server/src/server/router/ir/usc/types.ts index 63ab15fb5..b2106c5da 100644 --- a/server/src/server/router/ir/usc/types.ts +++ b/server/src/server/router/ir/usc/types.ts @@ -1,4 +1,4 @@ -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export interface USCServerScore { score: integer; diff --git a/server/src/server/router/ir/usc/usc.test.ts b/server/src/server/router/ir/usc/usc.test.ts index df9ced7c0..3297feb53 100644 --- a/server/src/server/router/ir/usc/usc.test.ts +++ b/server/src/server/router/ir/usc/usc.test.ts @@ -2,7 +2,7 @@ import t from "tap"; import db from "../../../../external/mongo/db"; import ResetDBState from "../../../../test-utils/resets"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; -import { ChartDocument, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; +import { ChartDocument, PBScoreDocument, ScoreDocument } from "tachi-common"; import deepmerge from "deepmerge"; import { CloseAllConnections } from "../../../../test-utils/close-connections"; diff --git a/server/src/server/router/ir/usc/usc.ts b/server/src/server/router/ir/usc/usc.ts index d0eceb08f..514b11c6b 100644 --- a/server/src/server/router/ir/usc/usc.ts +++ b/server/src/server/router/ir/usc/usc.ts @@ -1,4 +1,4 @@ -import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "kamaitachi-common"; +import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "tachi-common"; import CreateLogCtx from "../../../../lib/logger/logger"; import { GetPBOnChart, GetServerRecordOnChart } from "../../../../utils/scores"; import { MStoS } from "../../../../utils/misc"; diff --git a/server/src/server/server.ts b/server/src/server/server.ts index b29ee8085..2f2bf74bd 100644 --- a/server/src/server/server.ts +++ b/server/src/server/server.ts @@ -2,7 +2,7 @@ import express, { Express } from "express"; import "express-async-errors"; import CreateLogCtx from "../lib/logger/logger"; import expressSession from "express-session"; -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; import { RedisClient } from "../external/redis/redis"; import { SESSION_SECRET } from "../lib/env/env"; import connectRedis from "connect-redis"; diff --git a/server/src/test-utils/test-data.ts b/server/src/test-utils/test-data.ts index fdfd6b87c..be0568e98 100644 --- a/server/src/test-utils/test-data.ts +++ b/server/src/test-utils/test-data.ts @@ -8,7 +8,7 @@ import { FolderDocument, MilestoneDocument, SongDocument, -} from "kamaitachi-common"; +} from "tachi-common"; import path from "path"; import db from "../external/mongo/db"; import { diff --git a/server/src/utils/class.ts b/server/src/utils/class.ts index ec1b9e5a7..044915f87 100644 --- a/server/src/utils/class.ts +++ b/server/src/utils/class.ts @@ -1,7 +1,7 @@ -import { Game, integer, IDStrings, Playtypes, UserGameStats } from "kamaitachi-common"; +import { Game, integer, IDStrings, Playtypes, UserGameStats } from "tachi-common"; import db from "../external/mongo/db"; import CreateLogCtx from "../lib/logger/logger"; -import { GameClassSets } from "kamaitachi-common/js/game-classes"; +import { GameClassSets } from "tachi-common/js/game-classes"; import { RedisPub } from "../external/redis/redis-IPC"; const logger = CreateLogCtx(__filename); diff --git a/server/src/utils/db.ts b/server/src/utils/db.ts index 14b4bfe70..58c9c4e5b 100644 --- a/server/src/utils/db.ts +++ b/server/src/utils/db.ts @@ -1,7 +1,7 @@ import db from "../external/mongo/db"; import CreateLogCtx from "../lib/logger/logger"; const logger = CreateLogCtx(__filename); -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export async function GetNextCounterValue(counterName: string): Promise { const sequenceDoc = await db.counters.findOneAndUpdate( diff --git a/server/src/utils/folder.test.ts b/server/src/utils/folder.test.ts index 4118a5390..de01cd2fd 100644 --- a/server/src/utils/folder.test.ts +++ b/server/src/utils/folder.test.ts @@ -1,7 +1,7 @@ import t from "tap"; import CreateLogCtx from "../lib/logger/logger"; import { Testing511SPA } from "../test-utils/test-data"; -import { ChartDocument, FolderDocument } from "kamaitachi-common"; +import { ChartDocument, FolderDocument } from "tachi-common"; import { CreateFolderChartLookup, GetFolderChartIDs, diff --git a/server/src/utils/folder.ts b/server/src/utils/folder.ts index 1efe06b0d..4690a657f 100644 --- a/server/src/utils/folder.ts +++ b/server/src/utils/folder.ts @@ -1,6 +1,6 @@ import db from "../external/mongo/db"; import CreateLogCtx from "../lib/logger/logger"; -import { FolderDocument, AnyChartDocument, AnySongDocument } from "kamaitachi-common"; +import { FolderDocument, AnyChartDocument, AnySongDocument } from "tachi-common"; import { FilterQuery } from "mongodb"; import deepmerge from "deepmerge"; diff --git a/server/src/utils/goal.test.ts b/server/src/utils/goal.test.ts index 40eb2e555..48b5e03ee 100644 --- a/server/src/utils/goal.test.ts +++ b/server/src/utils/goal.test.ts @@ -3,7 +3,7 @@ import db from "../external/mongo/db"; import CreateLogCtx from "../lib/logger/logger"; import ResetDBState from "../test-utils/resets"; import { EvaluateGoalForUser } from "./goal"; -import { GoalDocument } from "kamaitachi-common"; +import { GoalDocument } from "tachi-common"; import deepmerge from "deepmerge"; import { HC511Goal, diff --git a/server/src/utils/goal.ts b/server/src/utils/goal.ts index 18b026a26..85d4e4437 100644 --- a/server/src/utils/goal.ts +++ b/server/src/utils/goal.ts @@ -1,5 +1,5 @@ -import { GoalDocument, integer, PBScoreDocument, Game } from "kamaitachi-common"; -import { grades, lamps } from "kamaitachi-common/js/config"; +import { GoalDocument, integer, PBScoreDocument, Game } from "tachi-common"; +import { grades, lamps } from "tachi-common/js/config"; import db from "../external/mongo/db"; import { KtLogger } from "../lib/logger/logger"; import { GetFolderChartIDs } from "./folder"; diff --git a/server/src/utils/milestone.ts b/server/src/utils/milestone.ts index 9f9218107..660f6f542 100644 --- a/server/src/utils/milestone.ts +++ b/server/src/utils/milestone.ts @@ -1,4 +1,4 @@ -import { MilestoneDocument, integer } from "kamaitachi-common"; +import { MilestoneDocument, integer } from "tachi-common"; /** * Retrieves the goalID documents in a single array from the diff --git a/server/src/utils/queries/charts.ts b/server/src/utils/queries/charts.ts index 846df717f..8a34b1b5f 100644 --- a/server/src/utils/queries/charts.ts +++ b/server/src/utils/queries/charts.ts @@ -1,4 +1,4 @@ -import { Difficulties, Game, integer, Playtypes, IDStrings } from "kamaitachi-common"; +import { Difficulties, Game, integer, Playtypes, IDStrings } from "tachi-common"; import db from "../../external/mongo/db"; export function FindChartWithChartID(game: Game, chartID: string) { diff --git a/server/src/utils/queries/songs.ts b/server/src/utils/queries/songs.ts index 670757f48..f148f39ae 100644 --- a/server/src/utils/queries/songs.ts +++ b/server/src/utils/queries/songs.ts @@ -1,4 +1,4 @@ -import { Game, AnySongDocument, integer } from "kamaitachi-common"; +import { Game, AnySongDocument, integer } from "tachi-common"; import { FindOneResult } from "monk"; import db from "../../external/mongo/db"; import { KtLogger } from "../../lib/logger/logger"; diff --git a/server/src/utils/scores.ts b/server/src/utils/scores.ts index f13419729..4d3e168c1 100644 --- a/server/src/utils/scores.ts +++ b/server/src/utils/scores.ts @@ -1,5 +1,5 @@ import db from "../external/mongo/db"; -import { integer } from "kamaitachi-common"; +import { integer } from "tachi-common"; export function GetPBOnChart(userID: integer, chartID: string) { return db["score-pbs"].findOne({ diff --git a/server/src/utils/session.ts b/server/src/utils/session.ts index 4e50a1041..ca5940631 100644 --- a/server/src/utils/session.ts +++ b/server/src/utils/session.ts @@ -1,4 +1,4 @@ -import { SessionDocument, ScoreDocument, SessionScoreInfo } from "kamaitachi-common"; +import { SessionDocument, ScoreDocument, SessionScoreInfo } from "tachi-common"; import { Condition } from "mongodb"; import db from "../external/mongo/db"; diff --git a/server/src/utils/tierlist.ts b/server/src/utils/tierlist.ts index cc4942f83..db5411e6d 100644 --- a/server/src/utils/tierlist.ts +++ b/server/src/utils/tierlist.ts @@ -1,5 +1,5 @@ import crypto from "crypto"; -import { AnyChartDocument, Game, Playtypes } from "kamaitachi-common"; +import { AnyChartDocument, Game, Playtypes } from "tachi-common"; import db from "../external/mongo/db"; import CreateLogCtx from "../lib/logger/logger"; diff --git a/server/src/utils/types.ts b/server/src/utils/types.ts index 99182ae83..619474f79 100644 --- a/server/src/utils/types.ts +++ b/server/src/utils/types.ts @@ -1,4 +1,4 @@ -import { integer, GenericAuthDocument, ChartDocument } from "kamaitachi-common"; +import { integer, GenericAuthDocument, ChartDocument } from "tachi-common"; declare module "express-session" { // Inject additional properties on express-session diff --git a/server/src/utils/user.test.ts b/server/src/utils/user.test.ts index b68a029e4..c34f99d1c 100644 --- a/server/src/utils/user.test.ts +++ b/server/src/utils/user.test.ts @@ -2,7 +2,7 @@ import t from "tap"; import { PRUDENCE_PRIVATE_USER, PRUDENCE_PUBLIC_USER } from "../external/mongo/schemas"; import { prAssert } from "../test-utils/asserts"; import { GetUserCaseInsensitive, PRIVATEINFO_GetUserCaseInsensitive, FormatUserDoc } from "./user"; -import { PublicUserDocument } from "kamaitachi-common"; +import { PublicUserDocument } from "tachi-common"; import { CloseAllConnections } from "../test-utils/close-connections"; import ResetDBState from "../test-utils/resets"; diff --git a/server/src/utils/user.ts b/server/src/utils/user.ts index 63568c03e..230376d7c 100644 --- a/server/src/utils/user.ts +++ b/server/src/utils/user.ts @@ -1,4 +1,4 @@ -import { integer, PublicUserDocument } from "kamaitachi-common"; +import { integer, PublicUserDocument } from "tachi-common"; import { FindOneResult } from "monk"; import db from "../external/mongo/db"; import CreateLogCtx from "../lib/logger/logger";