mirror of
https://github.com/blitzkit/blitzkit.git
synced 2026-10-21 02:37:05 +02:00
only supply full name if it's different
This commit is contained in:
1 parent
6153beced6
commit
f3a8f2faab
2 files changed
+21
-11
No files matched your search
@@ -350,6 +350,15 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
|
|||||||
const tankClass =
|
const tankClass =
|
||||||
this.blitzTankClassToBlitzkit[blitzTankClass as BlitzTankClass];
|
this.blitzTankClassToBlitzkit[blitzTankClass as BlitzTankClass];
|
||||||
|
|
||||||
|
const canonicalFullName = this.getString(tank.userString);
|
||||||
|
const name =
|
||||||
|
(tank.shortUserString
|
||||||
|
? this.getString(tank.shortUserString)
|
||||||
|
: undefined) ?? canonicalFullName;
|
||||||
|
// only supply full name if it's different from the displayed short name to save some bytes
|
||||||
|
const name_full =
|
||||||
|
name === canonicalFullName ? undefined : canonicalFullName;
|
||||||
|
|
||||||
tankDefinitions.tanks[tankId] = {
|
tankDefinitions.tanks[tankId] = {
|
||||||
ancestors: [],
|
ancestors: [],
|
||||||
successors: [],
|
successors: [],
|
||||||
@@ -367,13 +376,8 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
|
|||||||
typeof equipment === "string" ? equipment : equipment.at(-1)!,
|
typeof equipment === "string" ? equipment : equipment.at(-1)!,
|
||||||
max_consumables: tankDefinition.root.consumableSlots,
|
max_consumables: tankDefinition.root.consumableSlots,
|
||||||
max_provisions: tankDefinition.root.provisionSlots,
|
max_provisions: tankDefinition.root.provisionSlots,
|
||||||
name:
|
name,
|
||||||
(tank.shortUserString
|
name_full,
|
||||||
? this.getString(tank.shortUserString)
|
|
||||||
: undefined) ?? this.getString(tank.userString),
|
|
||||||
name_full: tank.shortUserString
|
|
||||||
? this.getString(tank.userString)
|
|
||||||
: undefined,
|
|
||||||
slug,
|
slug,
|
||||||
nation,
|
nation,
|
||||||
type: tankTags.includes("collectible")
|
type: tankTags.includes("collectible")
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) {
|
|||||||
draft.search = sanitized.length === 0 ? null : sanitized;
|
draft.search = sanitized.length === 0 ? null : sanitized;
|
||||||
});
|
});
|
||||||
}, 500),
|
}, 500),
|
||||||
[]
|
[],
|
||||||
);
|
);
|
||||||
const handleChange = useCallback(() => {
|
const handleChange = useCallback(() => {
|
||||||
if (!searching) {
|
if (!searching) {
|
||||||
@@ -46,8 +46,14 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) {
|
|||||||
}, [searching]);
|
}, [searching]);
|
||||||
const handleKeyDown = useCallback<KeyboardEventHandler>(
|
const handleKeyDown = useCallback<KeyboardEventHandler>(
|
||||||
(event) => {
|
(event) => {
|
||||||
if (event.key !== "Enter" || !topResult) return;
|
if (
|
||||||
if (!TankFilters.state.search || TankFilters.state.searching) return;
|
event.key !== "Enter" ||
|
||||||
|
!topResult ||
|
||||||
|
!TankFilters.state.search ||
|
||||||
|
TankFilters.state.searching
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
@@ -57,7 +63,7 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) {
|
|||||||
window.location.href = `/tanks/${topResult.slug}`;
|
window.location.href = `/tanks/${topResult.slug}`;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[topResult]
|
[topResult],
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in new issue
Block a user