Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-03-21 18:04:39 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix analyzer crash with invalid URL Closes #1291

Browse Source
This commit is contained in:
Kalle 2023-03-12 11:18:08 +02:00
parent a1d9add1ac
commit b588be680c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/features/build-analyzer/analyzer-hooks.ts
View File

@ -12,18 +12,20 @@ import { applySpecialEffects, SPECIAL_EFFECTS } from "./core/specialEffects";
import { buildStats } from "./core/stats";
import type { SpecialEffectType } from "./analyzer-types";
import {
buildIsEmpty,
buildToAbilityPoints,
serializeBuild,
validatedBuildFromSearchParams,
validatedWeaponIdFromSearchParams,
} from "./core/utils";
import invariant from "tiny-invariant";
export function useAnalyzeBuild() {
const [searchParams, setSearchParams] = useSearchParams();
const mainWeaponId = validatedWeaponIdFromSearchParams(searchParams);
const build = validatedBuildFromSearchParams(searchParams);
const build2 = validatedBuildFromSearchParams(searchParams, "build2");
const build2 = validatedBuildFromSearchParams(searchParams, "build2", build);
const ldeIntensity = validatedLdeIntensityFromSearchParams(searchParams);
const effects = validatedEffectsFromSearchParams({ searchParams, build });
const effects2 = validatedEffectsFromSearchParams({
@ -32,6 +34,11 @@ export function useAnalyzeBuild() {
});
const focused = validatedFocusedFromSearchParams({ searchParams });
invariant(
!(buildIsEmpty(build) && !buildIsEmpty(build2)),
"build1 is empty but build2 isn't"
);
const handleChange = ({
newMainWeaponId = mainWeaponId,
newBuild = build,

4
app/features/build-analyzer/core/utils.ts
View File

@ -191,13 +191,15 @@ function validateAbility(
export function validatedBuildFromSearchParams(
searchParams: URLSearchParams,
key = "build"
key = "build",
otherBuild?: BuildAbilitiesTupleWithUnknown
): BuildAbilitiesTupleWithUnknown {
const abilitiesArr = searchParams.get(key)
? searchParams.get(key)?.split(",")
: null;
if (!abilitiesArr) return EMPTY_BUILD;
if (otherBuild && buildIsEmpty(otherBuild)) return EMPTY_BUILD;
try {
return [