Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-05 05:18:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #348 from TeamNewGuys:zkldi/issue-343-Folder-Tags

Browse Source 
Add folder searchTerms
This commit is contained in:
zkldi
2021-09-17 12:54:53 +01:00
committed by GitHub
parent 88eb26be9d 2f11810a86
commit 7ed706b0c5
37 changed files with 87 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/.dcignore
-3
View File
@@ -1,3 +0,0 @@
scripts
src/**/*.test.ts
src/test-utils
server/.gitignore
+2 -1
View File
@@ -32,4 +32,5 @@ test-cdn
# Weird Redis Dumps
dump.rdb
scripts/quick-insert/insert.ts
scripts/quick-insert/insert.ts
scripts/bpi-poyashi-data/output.json
server/package.json
+1 -1
View File
@@ -73,7 +73,7 @@
"redis": "3.1.2",
"rimraf": "3.0.2",
"safe-json-stringify": "1.2.0",
"tachi-common": "0.2.15",
"tachi-common": "0.2.17",
"typescript": "4.3.4",
"winston": "3.3.3"
},
server/pnpm-lock.yaml
Generated
+4 -4
View File
@@ -54,7 +54,7 @@ specifiers:
rimraf: 3.0.2
safe-json-stringify: 1.2.0
supertest: 6.1.3
tachi-common: 0.2.15
tachi-common: 0.2.17
tap: 15.0.9
ts-node: 10.0.0
tsconfig-paths: 3.10.1
@@ -88,7 +88,7 @@ dependencies:
redis: 3.1.2
rimraf: 3.0.2
safe-json-stringify: 1.2.0
tachi-common: 0.2.15
tachi-common: 0.2.17
typescript: 4.3.4
winston: 3.3.3
@@ -3892,8 +3892,8 @@ packages:
strip-ansi: 6.0.0
dev: true
/tachi-common/0.2.15:
resolution: {integrity: sha512-p7nt7pupl2JWNb20K7n18YOBtxUYeoyDsE6YbPVVyPvY1oj74a2YxALpmajGV2pbVAkdywrJS94In2sQUGzJtw==}
/tachi-common/0.2.17:
resolution: {integrity: sha512-Qnb6i7VLS6oyutO7iqpXdMhytrINZbXBChdoRbX87ubMH12fwzy67cVWQ2SmTot8JrEqhYCf9/lsZeghsDCT+g==}
dependencies:
monk: 7.3.4
transitivePeerDependencies:
server/scripts/__KT_DATABASE_MIGRATION/songs/songs-chunithm.ts
+2 -2
View File
@@ -10,8 +10,8 @@ function ConvertFn(c: any): SongDocument<"chunithm"> {
artist: c.artist,
id: c.id,
firstVersion: c.firstAppearance,
"alt-titles": c["alt-titles"].filter((e: string) => e !== c.title),
"search-titles": c["search-titles"]
altTitles: c.altTitles.filter((e: string) => e !== c.title),
searchTerms: c.searchTerms
.map((e: string) => e.toString())
.filter((e: string) => e !== c.title),
data: {
server/scripts/__KT_DATABASE_MIGRATION/songs/songs-ddr.ts
+2 -2
View File
@@ -10,8 +10,8 @@ function ConvertFn(c: any): SongDocument<"ddr"> {
artist: c.artist,
id: c.id,
firstVersion: c.firstAppearance,
"alt-titles": c["alt-titles"] ? c["alt-titles"].filter((e: string) => e !== c.title) : [],
"search-titles": c["search-title"]
altTitles: c.altTitles ? c.altTitles.filter((e: string) => e !== c.title) : [],
searchTerms: c["search-title"]
.filter((e: string) => !!e)
.map((e: string) => e.toString())
.filter((e: string) => e !== c.title),
server/scripts/__KT_DATABASE_MIGRATION/songs/songs-iidx.ts
+2 -2
View File
@@ -9,8 +9,8 @@ function ConvertFn(c: any): SongDocument<"iidx"> {
artist: c.artist,
id: c.id,
firstVersion: c.firstAppearance,
"alt-titles": c["alt-titles"].filter((e: string) => e !== c.title),
"search-titles": c["search-titles"]
altTitles: c.altTitles.filter((e: string) => e !== c.title),
searchTerms: c.searchTerms
.map((e: string) => e.toString())
.filter((e: string) => e !== c.title),
data: {
server/scripts/__KT_DATABASE_MIGRATION/songs/songs-museca.ts
+2 -2
View File
@@ -9,8 +9,8 @@ function ConvertFn(c: any): SongDocument<"museca"> {
artist: c.artist,
id: c.id,
firstVersion: c.firstAppearance,
"alt-titles": [],
"search-titles": [],
altTitles: [],
searchTerms: [],
data: {
titleJP: c.title_jp,
artistJP: c.artist_jp,
server/scripts/__KT_DATABASE_MIGRATION/songs/songs-sdvx.ts
+2 -2
View File
@@ -9,8 +9,8 @@ function ConvertFn(c: any): SongDocument<"sdvx"> {
artist: c.artist,
id: c.id,
firstVersion: c.firstAppearance,
"alt-titles": c["alt-titles"].filter((e: string) => e !== c.title),
"search-titles": c["search-titles"]
altTitles: c.altTitles.filter((e: string) => e !== c.title),
searchTerms: c.searchTerms
.map((e: string) => e.toString())
.filter((e: string) => e !== c.title),
data: {
server/scripts/bms-tables/table-sync.ts
+1
View File
@@ -142,6 +142,7 @@ export async function UpdateTable(table: BMSTablesDataset) {
playtype: table.playtype,
type: "charts",
data: query,
searchTerms: [`${table.name} ${level}`],
});
logger.info(`Inserted new table ${table.prefix}${level}.`);
server/scripts/bpi-poyashi-data/output.json
-1
View File
File diff suppressed because one or more lines are too long
server/scripts/update-bpi-poyashi.ts → server/scripts/bpi-poyashi-data/update-bpi-poyashi.ts
+1 -1
View File
@@ -19,7 +19,7 @@ program.option("-f, --fetch", "Fetch the latest data from the poyashi repo.");
program.parse(process.argv);
const options = program.opts();
const dataLoc = path.join(__dirname, "./bpi-poyashi-data/output.json");
const dataLoc = path.join(__dirname, "./output.json");
const difficultyResolve: Record<string, [string, string]> = {
3: ["SP", "HYPER"],
server/scripts/folders/create-tables-and-folders.ts
+1
View File
@@ -133,6 +133,7 @@ async function InsertStaticLevelVersionFolders() {
title: `Level ${level} (${version})`,
type: "charts",
data: query,
searchTerms: [],
inactive,
});
server/scripts/invites/create-invite-code.ts
+4 -3
View File
@@ -1,6 +1,7 @@
import db from "../../src/external/mongo/db";
import db from "external/mongo/db";
import { Command } from "commander";
import CreateLogCtx from "../../src/lib/logger/logger";
import CreateLogCtx from "lib/logger/logger";
import { Random20Hex } from "utils/misc";
const logger = CreateLogCtx(__filename);
@@ -12,7 +13,7 @@ program.parse(process.argv);
const options = program.opts();
if (!options.code) {
throw new Error(`No code specified.`);
options.code = Random20Hex();
}
db.invites
server/scripts/single-use/migrate-song-names.ts
+21
View File
@@ -0,0 +1,21 @@
import db from "external/mongo/db";
import CreateLogCtx from "lib/logger/logger";
import { StaticConfig } from "tachi-common";
const logger = CreateLogCtx(__filename);
(async () => {
for (const game of StaticConfig.allSupportedGames) {
// eslint-disable-next-line no-await-in-loop
await db.songs[game].update(
{},
{ $rename: { "alt-titles": "altTitles", "search-titles": "searchTerms" } },
{ multi: true }
);
logger.info(`Refactored title names for ${game}.`);
}
logger.info(`Done.`);
process.exit(0);
})();
server/src/external/mongo/indexes.ts
Vendored
+3 -3
View File
@@ -61,7 +61,7 @@ const staticIndexes: Partial<Record<Databases, Index[]>> = {
index({ game: 1, playtype: 1 }),
index({ game: 1, playtype: 1, table: 1 }),
index({ game: 1, playtype: 1, table: 1, tableIndex: 1 }),
index({ title: "text" }),
index({ title: "text", searchTerms: "text" }),
],
"kai-auth-tokens": [index({ userID: 1, service: 1 }, UNIQUE)],
"charts-iidx": [
@@ -106,13 +106,13 @@ for (const game of ServerTypeInfo.supportedGames) {
if (indexes[`songs-${game}` as Databases]) {
indexes[`songs-${game}` as Databases]!.push(
index({ id: 1 }, UNIQUE),
index({ title: "text", artist: "text", "alt-titles": "text", "search-titles": "text" })
index({ title: "text", artist: "text", altTitles: "text", searchTerms: "text" })
);
} else {
indexes[`songs-${game}` as Databases] = [
index({ id: 1 }, UNIQUE),
index({ title: 1 }),
index({ title: "text", artist: "text", "alt-titles": "text", "search-titles": "text" }),
index({ title: "text", artist: "text", altTitles: "text", searchTerms: "text" }),
];
}
}
server/src/external/mongo/schemas.ts
Vendored
+2 -2
View File
@@ -365,8 +365,8 @@ const PRUDENCE_SONG_BASE: PrudenceSchema = {
id: p.isPositiveInteger,
title: "string",
artist: "string",
"search-titles": [p.and("string", (self, parent) => self !== parent.title)],
"alt-titles": [p.and("string", (self, parent) => self !== parent.title)],
searchTerms: [p.and("string", (self, parent) => self !== parent.title)],
altTitles: [p.and("string", (self, parent) => self !== parent.title)],
firstVersion: "string",
};
server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts
+2 -2
View File
@@ -18,8 +18,8 @@ t.test("#ConverterIRBarbatos", (t) => {
artist: "無力P",
id: 1,
firstVersion: "booth",
"alt-titles": [],
"search-titles": ["albida_muryoku", "ｱﾙﾋﾞﾀﾞﾊﾟﾜｰﾚｽﾐｯｸｽ"],
altTitles: [],
searchTerms: ["albida_muryoku", "ｱﾙﾋﾞﾀﾞﾊﾟﾜｰﾚｽﾐｯｸｽ"],
data: {
uscEquiv: null,
},
server/src/lib/score-import/import-types/ir/beatoraja/converter.ts
+2 -2
View File
@@ -187,8 +187,8 @@ function ConvertBeatorajaChartToTachi(chart: BeatorajaChart) {
title: chart.title,
firstVersion: "",
id: 0,
"alt-titles": [],
"search-titles": [],
altTitles: [],
searchTerms: [],
data: {
genre: chart.genre,
subartist: chart.subartist,
server/src/lib/search/search.test.ts
+2 -2
View File
@@ -14,8 +14,8 @@ t.test("#SearchGameSongs", (t) => {
{
title: "text",
artist: "text",
"alt-titles": "text",
"search-titles": "text",
altTitles: "text",
searchTerms: "text",
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any /* known bug with monk */
);
server/src/server/router/api/v1/games/_game/_playtype/folders/router.test.ts
+1
View File
@@ -17,6 +17,7 @@ const mockFolder: FolderDocument = {
level: "10",
},
type: "charts",
searchTerms: [],
inactive: false,
};
server/src/server/router/ir/usc/router.test.ts
+2 -2
View File
@@ -562,8 +562,8 @@ t.test("POST /scores", async (t) => {
artist: "test_artist",
firstVersion: null,
id: 0,
"alt-titles": [],
"search-titles": [],
altTitles: [],
searchTerms: [],
data: {},
});
server/src/server/router/ir/usc/usc.ts
+2 -2
View File
@@ -226,8 +226,8 @@ export function ConvertUSCChart(uscChartDoc: USCClientChart) {
firstVersion: null,
id: 0,
data: {},
"alt-titles": [],
"search-titles": [],
altTitles: [],
searchTerms: [],
};
return { chart, song };
server/src/test-utils/mock-db/songs-bms.json
+2 -2
View File
@@ -9,7 +9,7 @@
"subartist": null,
"genre": "ELECTRANCE"
},
"search-titles": [],
"alt-titles": []
"searchTerms": [],
"altTitles": []
}
]
server/src/test-utils/mock-db/songs-chunithm.json
+2 -2
View File
@@ -3,8 +3,8 @@
"artist": "nora2r",
"id": 3,
"firstVersion": "chuni",
"alt-titles": [],
"search-titles": [],
"altTitles": [],
"searchTerms": [],
"data": {
"genre": "VARIETY"
}
server/src/test-utils/mock-db/songs-ddr.json
+2 -2
View File
@@ -4,8 +4,8 @@
"artist": "UZI-LAY",
"id": 10,
"firstVersion": "2",
"alt-titles": [],
"search-titles": [
"altTitles": [],
"searchTerms": [
"putyourfaithinme"
],
"data": {}
server/src/test-utils/mock-db/songs-iidx.json
+2 -2
View File
@@ -4,8 +4,8 @@
"artist": "dj nagureo",
"id": 1,
"firstVersion": "0",
"alt-titles": [],
"search-titles": [],
"altTitles": [],
"searchTerms": [],
"data": {
"genre": "PIANO AMBIENT"
}
server/src/test-utils/mock-db/songs-sdvx.json
+2 -2
View File
@@ -4,8 +4,8 @@
"artist": "無力P",
"id": 1,
"firstVersion": "booth",
"alt-titles": [],
"search-titles": [
"altTitles": [],
"searchTerms": [
"albida_muryoku",
"ｱﾙﾋﾞﾀﾞﾊﾟﾜｰﾚｽﾐｯｸｽ"
],
server/src/test-utils/mock-db/songs-usc.json
+2 -2
View File
@@ -4,8 +4,8 @@
"artist": "無力P",
"id": 1,
"firstVersion": null,
"alt-titles": [],
"search-titles": [],
"altTitles": [],
"searchTerms": [],
"data": {}
}
]
server/src/test-utils/test-data.ts
+1
View File
@@ -114,6 +114,7 @@ export const TestingIIDXFolderSP10: FolderDocument = {
level: "10",
"flags¬IN BASE GAME": true,
},
searchTerms: [],
inactive: false,
};
server/src/test-utils/test-data/tachi/bms-gazer-song.json
+2 -2
View File
@@ -8,6 +8,6 @@
"subartist": null,
"genre": "ELECTRANCE"
},
"search-titles": [],
"alt-titles": []
"searchTerms": [],
"altTitles": []
}
server/src/test-utils/test-data/tachi/chunithm-bbkk-song.json
+2 -2
View File
@@ -3,8 +3,8 @@
"artist": "nora2r",
"id": 3,
"firstVersion": "chuni",
"alt-titles": [],
"search-titles": [],
"altTitles": [],
"searchTerms": [],
"data": {
"genre": "VARIETY"
}
server/src/test-utils/test-data/tachi/ddr-puty-song.json
+2 -2
View File
@@ -3,8 +3,8 @@
"artist": "UZI-LAY",
"id": 10,
"firstVersion": "2",
"alt-titles": [],
"search-titles": [
"altTitles": [],
"searchTerms": [
"putyourfaithinme"
],
"data": {}
server/src/test-utils/test-data/tachi/iidx-511-song.json
+2 -2
View File
@@ -3,8 +3,8 @@
"artist": "dj nagureo",
"id": 1,
"firstVersion": "0",
"alt-titles": [],
"search-titles": [],
"altTitles": [],
"searchTerms": [],
"data": {
"genre": "PIANO AMBIENT"
}
server/src/test-utils/test-data/tachi/sdvx-albida-song.json
+2 -2
View File
@@ -3,8 +3,8 @@
"artist": "無力P",
"id": 1,
"firstVersion": "booth",
"alt-titles": [],
"search-titles": [
"altTitles": [],
"searchTerms": [
"albida_muryoku",
"ｱﾙﾋﾞﾀﾞﾊﾟﾜｰﾚｽﾐｯｸｽ"
],
server/src/test-utils/test-data/tachi/tachi-songs-iidx.json
+1 -1
View File
File diff suppressed because one or more lines are too long
server/src/utils/queries/songs.ts
+2 -2
View File
@@ -21,7 +21,7 @@ export function FindSongOnTitle(game: Game, title: string): Promise<FindOneResul
title: title,
},
{
"alt-titles": title,
altTitles: title,
},
],
});
@@ -44,7 +44,7 @@ export function FindSongOnTitleInsensitive(
title: { $regex: regex },
},
{
"alt-titles": { $regex: regex },
altTitles: { $regex: regex },
},
],
});