From 3b4af3e19e4cdad8bb2f727d040964b1928415c0 Mon Sep 17 00:00:00 2001
From: legonzaur <legonzaur@live.fr>
Date: Wed, 22 Mar 2023 21:10:32 +0100
Subject: [PATCH] fix server id 0 for client

---
 src/cache/cacheUtils.ts | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/cache/cacheUtils.ts b/src/cache/cacheUtils.ts
index d3ce09e..0dd17d4 100644
--- a/src/cache/cacheUtils.ts
+++ b/src/cache/cacheUtils.ts
@@ -11,7 +11,9 @@ export async function getWeaponReport(
   server?: number,
   player?: string
 ) {
-  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
+  const serverPrefix = !isNaN(Number(server?.toString()))
+    ? `servers:${server}:`
+    : ''
   const playerPrefix = player ? `players:${player}:` : ''
   const cacheLocation = serverPrefix + playerPrefix + `weapons:` + weapon
   const data = await cache.HGETALL(cacheLocation)
@@ -20,7 +22,9 @@ export async function getWeaponReport(
 }
 
 export function getWeaponSet(server?: number, player?: string) {
-  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
+  const serverPrefix = !isNaN(Number(server?.toString()))
+    ? `servers:${server}:`
+    : ''
   const playerPrefix = player ? `players:${player}:` : ''
   const cacheLocation = serverPrefix + playerPrefix + `weapons`
   return cache.SMEMBERS(cacheLocation)
@@ -33,7 +37,9 @@ export function getWeaponSet(server?: number, player?: string) {
  * @returns string
  */
 export async function getWeaponList(server?: string, player?: string) {
-  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
+  const serverPrefix = !isNaN(Number(server?.toString()))
+    ? `servers:${server}:`
+    : ''
   const playerPrefix = player ? `players:${player}:` : ''
   return JSON.parse(
     (await cache.GET(serverPrefix + playerPrefix + `weapons:processedList`)) ||
@@ -53,7 +59,9 @@ export async function getPlayerReport(
   server?: number,
   weapon?: string
 ) {
-  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
+  const serverPrefix = !isNaN(Number(server?.toString()))
+    ? `servers:${server}:`
+    : ''
   const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
   const cacheLocation = serverPrefix + weaponPrefix + `players:` + player
   const data = await cache.HGETALL(cacheLocation)
@@ -68,8 +76,11 @@ export async function getPlayerReport(
  * @returns string
  */
 export async function getPlayerList(server?: number, weapon?: string) {
-  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
+  const serverPrefix = !isNaN(Number(server?.toString()))
+    ? `servers:${server}:`
+    : ''
   const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
+
   return JSON.parse(
     (await cache.GET(serverPrefix + weaponPrefix + `players:processedList`)) ||
       '{}'
@@ -77,7 +88,9 @@ export async function getPlayerList(server?: number, weapon?: string) {
 }
 
 export function getPlayerSet(server?: number, weapon?: string) {
-  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
+  const serverPrefix = !isNaN(Number(server?.toString()))
+    ? `servers:${server}:`
+    : ''
   const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
   const cacheLocation = serverPrefix + weaponPrefix + `players`
   return cache.SMEMBERS(cacheLocation)