From 3a2c850eab3cbf8a45acd6e5c3cbeed8785cd791 Mon Sep 17 00:00:00 2001
From: legonzaur <legonzaur@live.fr>
Date: Wed, 22 Mar 2023 21:00:59 +0100
Subject: [PATCH] fix process when server id is 0

---
 src/cache/cacheUtils.ts             | 12 ++++++------
 src/client/process/processPlayer.ts |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cache/cacheUtils.ts b/src/cache/cacheUtils.ts
index 93a6e9f..d3ce09e 100644
--- a/src/cache/cacheUtils.ts
+++ b/src/cache/cacheUtils.ts
@@ -11,7 +11,7 @@ export async function getWeaponReport(
   server?: number,
   player?: string
 ) {
-  const serverPrefix = server ? `servers:${server}:` : ''
+  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
   const playerPrefix = player ? `players:${player}:` : ''
   const cacheLocation = serverPrefix + playerPrefix + `weapons:` + weapon
   const data = await cache.HGETALL(cacheLocation)
@@ -20,7 +20,7 @@ export async function getWeaponReport(
 }
 
 export function getWeaponSet(server?: number, player?: string) {
-  const serverPrefix = server ? `servers:${server}:` : ''
+  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
   const playerPrefix = player ? `players:${player}:` : ''
   const cacheLocation = serverPrefix + playerPrefix + `weapons`
   return cache.SMEMBERS(cacheLocation)
@@ -33,7 +33,7 @@ export function getWeaponSet(server?: number, player?: string) {
  * @returns string
  */
 export async function getWeaponList(server?: string, player?: string) {
-  const serverPrefix = server ? `servers:${server}:` : ''
+  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
   const playerPrefix = player ? `players:${player}:` : ''
   return JSON.parse(
     (await cache.GET(serverPrefix + playerPrefix + `weapons:processedList`)) ||
@@ -53,7 +53,7 @@ export async function getPlayerReport(
   server?: number,
   weapon?: string
 ) {
-  const serverPrefix = server ? `servers:${server}:` : ''
+  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
   const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
   const cacheLocation = serverPrefix + weaponPrefix + `players:` + player
   const data = await cache.HGETALL(cacheLocation)
@@ -68,7 +68,7 @@ export async function getPlayerReport(
  * @returns string
  */
 export async function getPlayerList(server?: number, weapon?: string) {
-  const serverPrefix = server ? `servers:${server}:` : ''
+  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
   const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
   return JSON.parse(
     (await cache.GET(serverPrefix + weaponPrefix + `players:processedList`)) ||
@@ -77,7 +77,7 @@ export async function getPlayerList(server?: number, weapon?: string) {
 }
 
 export function getPlayerSet(server?: number, weapon?: string) {
-  const serverPrefix = server ? `servers:${server}:` : ''
+  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
   const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
   const cacheLocation = serverPrefix + weaponPrefix + `players`
   return cache.SMEMBERS(cacheLocation)
diff --git a/src/client/process/processPlayer.ts b/src/client/process/processPlayer.ts
index ae5e056..f4a905a 100644
--- a/src/client/process/processPlayer.ts
+++ b/src/client/process/processPlayer.ts
@@ -18,7 +18,7 @@ const { count, max, avg } = db.fn
  * @returns
  */
 export async function populatePlayerSet(server?: number, weapon?: string) {
-  const serverPrefix = server ? `servers:${server}:` : ''
+  const serverPrefix = server?.toString() ? `servers:${server}:` : ''
   const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
   const cacheLocation = serverPrefix + weaponPrefix + `players`
   const last_entry = Number(await cache.GET(cacheLocation + ':last_entry')) || 0