ToneAPI/ToneAPI_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix process when server id is 0

Browse Source
This commit is contained in:
legonzaur
2023-03-22 21:00:59 +01:00
parent 7861f27564
commit 3a2c850eab
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cache/cacheUtils.ts
Vendored
+6 -6
View File
@@ -11,7 +11,7 @@ export async function getWeaponReport(
server?: number, server?: number,
player?: string player?: string
) { ) {
const serverPrefix = server ? `servers:${server}:` : '' const serverPrefix = server?.toString() ? `servers:${server}:` : ''
const playerPrefix = player ? `players:${player}:` : '' const playerPrefix = player ? `players:${player}:` : ''
const cacheLocation = serverPrefix + playerPrefix + `weapons:` + weapon const cacheLocation = serverPrefix + playerPrefix + `weapons:` + weapon
const data = await cache.HGETALL(cacheLocation) const data = await cache.HGETALL(cacheLocation)
@@ -20,7 +20,7 @@ export async function getWeaponReport(
} }
export function getWeaponSet(server?: number, player?: string) { export function getWeaponSet(server?: number, player?: string) {
const serverPrefix = server ? `servers:${server}:` : '' const serverPrefix = server?.toString() ? `servers:${server}:` : ''
const playerPrefix = player ? `players:${player}:` : '' const playerPrefix = player ? `players:${player}:` : ''
const cacheLocation = serverPrefix + playerPrefix + `weapons` const cacheLocation = serverPrefix + playerPrefix + `weapons`
return cache.SMEMBERS(cacheLocation) return cache.SMEMBERS(cacheLocation)
@@ -33,7 +33,7 @@ export function getWeaponSet(server?: number, player?: string) {
* @returns string * @returns string
*/ */
export async function getWeaponList(server?: string, player?: 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}:` : '' const playerPrefix = player ? `players:${player}:` : ''
return JSON.parse( return JSON.parse(
(await cache.GET(serverPrefix + playerPrefix + `weapons:processedList`)) || (await cache.GET(serverPrefix + playerPrefix + `weapons:processedList`)) ||
@@ -53,7 +53,7 @@ export async function getPlayerReport(
server?: number, server?: number,
weapon?: string weapon?: string
) { ) {
const serverPrefix = server ? `servers:${server}:` : '' const serverPrefix = server?.toString() ? `servers:${server}:` : ''
const weaponPrefix = weapon ? `weapons:${weapon}:` : '' const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
const cacheLocation = serverPrefix + weaponPrefix + `players:` + player const cacheLocation = serverPrefix + weaponPrefix + `players:` + player
const data = await cache.HGETALL(cacheLocation) const data = await cache.HGETALL(cacheLocation)
@@ -68,7 +68,7 @@ export async function getPlayerReport(
* @returns string * @returns string
*/ */
export async function getPlayerList(server?: number, weapon?: 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}:` : '' const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
return JSON.parse( return JSON.parse(
(await cache.GET(serverPrefix + weaponPrefix + `players:processedList`)) || (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) { export function getPlayerSet(server?: number, weapon?: string) {
const serverPrefix = server ? `servers:${server}:` : '' const serverPrefix = server?.toString() ? `servers:${server}:` : ''
const weaponPrefix = weapon ? `weapons:${weapon}:` : '' const weaponPrefix = weapon ? `weapons:${weapon}:` : ''
const cacheLocation = serverPrefix + weaponPrefix + `players` const cacheLocation = serverPrefix + weaponPrefix + `players`
return cache.SMEMBERS(cacheLocation) return cache.SMEMBERS(cacheLocation)
src/client/process/processPlayer.ts
+1 -1
View File
@@ -18,7 +18,7 @@ const { count, max, avg } = db.fn
* @returns * @returns
*/ */
export async function populatePlayerSet(server?: number, weapon?: string) { 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 weaponPrefix = weapon ? `weapons:${weapon}:` : ''
const cacheLocation = serverPrefix + weaponPrefix + `players` const cacheLocation = serverPrefix + weaponPrefix + `players`
const last_entry = Number(await cache.GET(cacheLocation + ':last_entry')) || 0 const last_entry = Number(await cache.GET(cacheLocation + ':last_entry')) || 0