From 7397f9dccf9a0bd31c2fe55ac141597a3ba2792e Mon Sep 17 00:00:00 2001 From: zkldi Date: Fri, 2 Jul 2021 14:17:49 +0100 Subject: [PATCH] solve some of snyk's issues with our codebase --- server/.dcignore | 3 +++ .../score-import/import-types/ir/fervidex/converter.ts | 3 +-- server/src/utils/string-checks.ts | 8 ++------ 3 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 server/.dcignore diff --git a/server/.dcignore b/server/.dcignore new file mode 100644 index 000000000..e597acaef --- /dev/null +++ b/server/.dcignore @@ -0,0 +1,3 @@ +scripts +src/**/*.test.ts +src/test-utils \ No newline at end of file diff --git a/server/src/lib/score-import/import-types/ir/fervidex/converter.ts b/server/src/lib/score-import/import-types/ir/fervidex/converter.ts index 365b32919..ba04511b3 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/converter.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/converter.ts @@ -29,12 +29,11 @@ export function TachifyAssist( assist: FervidexScore["option"]["assist"] ): DryScore<"iidx:SP" | "iidx:DP">["scoreMeta"]["assist"] { switch (assist) { + case "FULL_ASSIST": case "ASCR_LEGACY": return "FULL ASSIST"; case "AUTO_SCRATCH": return "AUTO SCRATCH"; - case "FULL_ASSIST": - return "FULL ASSIST"; case "LEGACY_NOTE": return "LEGACY NOTE"; case null: diff --git a/server/src/utils/string-checks.ts b/server/src/utils/string-checks.ts index 4b6fccd36..0a11bae1f 100644 --- a/server/src/utils/string-checks.ts +++ b/server/src/utils/string-checks.ts @@ -16,9 +16,7 @@ export function ParseStrPositiveInt(val: unknown) { const v = Number(val); - if (!Number.isSafeInteger(v)) { - return null; - } else if (v < 0) { + if (!Number.isSafeInteger(v) || v < 0) { return null; } @@ -38,9 +36,7 @@ export function ParseStrPositiveNonZeroInt(val: unknown) { const v = Number(val); - if (!Number.isSafeInteger(v)) { - return null; - } else if (v <= 0) { + if (!Number.isSafeInteger(v) || v <= 0) { return null; }