fix: stricter search

This commit is contained in:
TrèsAbhi committed 2024-08-12 19:47:35 -05:00
1 parent 79a01da317
commit 820c125912
4 files changed
+12 -9

No files matched your search

@@ -375,8 +375,7 @@ export const TankSearch = memo<TankSearchProps>(
return sort.direction === 'ascending' ? sorted : sorted.reverse(); return sort.direction === 'ascending' ? sorted : sorted.reverse();
} else { } else {
const searchedRaw = go(filters.search, awaitedTankNames, { const searchedRaw = go(filters.search, awaitedTankNames, {
key: 'combined', keys: ['searchableName', 'searchableNameDeburr'],
limit: 25,
}); });
const searchedTanks = searchedRaw.map( const searchedTanks = searchedRaw.map(
(result) => awaitedTankDefinitions[result.obj.id], (result) => awaitedTankDefinitions[result.obj.id],
+1 -1
View File
@@ -19,7 +19,7 @@ export default async function resolveTankId(
`${tank}`, `${tank}`,
await (techTreeOnly ? tankNamesTechTreeOnly : tankNames), await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
{ {
keys: ['combined'], keys: ['searchableName', 'searchableNameDeburr'],
limit: 1, limit: 1,
}, },
); );
+4 -2
View File
@@ -187,8 +187,10 @@ export const tankNames = tanksDefinitionsArray.then((tanks) =>
return { return {
id, id,
original: tank.name, name: tank.name,
combined: `${tank.name}${deburr(tank.name)}${tank.nameFull ? `${tank.nameFull}${deburr(tank.nameFull)}` : ''}`, nameFull: tank.nameFull,
searchableName: tank.nameFull ?? tank.name,
searchableNameDeburr: deburr(tank.nameFull ?? tank.name),
treeType: tank.treeType, treeType: tank.treeType,
}; };
}), }),
+6 -4
View File
@@ -29,18 +29,20 @@ export default async function autocompleteTanks(
focusedOption.value, focusedOption.value,
await (techTreeOnly ? tankNamesTechTreeOnly : tankNames), await (techTreeOnly ? tankNamesTechTreeOnly : tankNames),
{ {
keys: ['combined'], keys: ['searchableName', 'searchableNameDeburr'],
limit: 10, limit: 10,
}, },
).map(async (item) => { ).map(async (item) => {
let name = item.obj.original; let name = item.obj.searchableName;
if (name.length > DISCORD_CHOICES_MAX_NAME_SIZE) { if (name.length > DISCORD_CHOICES_MAX_NAME_SIZE) {
const overSize = name.length - DISCORD_CHOICES_MAX_NAME_SIZE; const overSize = name.length - DISCORD_CHOICES_MAX_NAME_SIZE;
name = `${item.obj.original.slice( name = `${item.obj.searchableName.slice(
0, 0,
item.obj.original.length - overSize - OVERFLOW_SUFFIX.length, item.obj.searchableName.length -
overSize -
OVERFLOW_SUFFIX.length,
)}${OVERFLOW_SUFFIX}`; )}${OVERFLOW_SUFFIX}`;
} }