From f3a8f2faab21c0423d8c229b3e3ed1b2f165678f Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Sun, 4 Oct 2026 14:03:32 -0500 Subject: [PATCH] only supply full name if it's different --- .../blitzkit/api/server/1_tankDefinitions.ts | 18 +++++++++++------- .../TankSearch/components/SearchBar.tsx | 14 ++++++++++---- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts index b7ff54c8d..e7192e140 100644 --- a/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts +++ b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts @@ -350,6 +350,15 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { const tankClass = 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] = { ancestors: [], successors: [], @@ -367,13 +376,8 @@ export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 { typeof equipment === "string" ? equipment : equipment.at(-1)!, max_consumables: tankDefinition.root.consumableSlots, max_provisions: tankDefinition.root.provisionSlots, - name: - (tank.shortUserString - ? this.getString(tank.shortUserString) - : undefined) ?? this.getString(tank.userString), - name_full: tank.shortUserString - ? this.getString(tank.userString) - : undefined, + name, + name_full, slug, nation, type: tankTags.includes("collectible") diff --git a/packages/website/src/components/TankSearch/components/SearchBar.tsx b/packages/website/src/components/TankSearch/components/SearchBar.tsx index 1a97aa3d2..034a2e458 100644 --- a/packages/website/src/components/TankSearch/components/SearchBar.tsx +++ b/packages/website/src/components/TankSearch/components/SearchBar.tsx @@ -33,7 +33,7 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) { draft.search = sanitized.length === 0 ? null : sanitized; }); }, 500), - [] + [], ); const handleChange = useCallback(() => { if (!searching) { @@ -46,8 +46,14 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) { }, [searching]); const handleKeyDown = useCallback( (event) => { - if (event.key !== "Enter" || !topResult) return; - if (!TankFilters.state.search || TankFilters.state.searching) return; + if ( + event.key !== "Enter" || + !topResult || + !TankFilters.state.search || + TankFilters.state.searching + ) { + return; + } event.preventDefault(); @@ -57,7 +63,7 @@ export function SearchBar({ topResult, skeleton, onSelect }: SearchBarProps) { window.location.href = `/tanks/${topResult.slug}`; } }, - [topResult] + [topResult], ); return (