Fix player slots (current, max) usage

MarechJ · May 21, 2024 · b3b707c · b3b707c
1 parent d1efa04
commit b3b707c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/rcon/rcon.py b/rcon/rcon.py
@@ -1020,13 +1020,13 @@ def get_slots(self) -> tuple[int, int]:
     @ttl_cache(ttl=5, cache_falsy=False)
     def get_status(self) -> StatusType:
         config = RconServerSettingsUserConfig.load_from_db()
-        slots = self.get_slots()
+        current_players, max_players = self.get_slots()
         return {
             "name": self.get_name(),
             "map": self.current_map.model_dump(),
-            "nb_players": slots,
+            "current_players": current_players,
+            "max_players": max_players,
             "short_name": config.short_name,
-            "player_count": slots.split("/")[0],
             "server_number": int(get_server_number()),
         }
 

diff --git a/rcon/stats_loop.py b/rcon/stats_loop.py
@@ -103,10 +103,9 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def snapshot(self, rcon):
-        slots = rcon.get_slots()
-        nb, _ = slots.split("/")
+        current_players, max_players = rcon.get_slots()
 
-        self.client.ts().add(self.NAME, "*", float(nb))
+        self.client.ts().add(self.NAME, "*", float(current_players))
 
 
 def run():

diff --git a/rcon/types.py b/rcon/types.py
@@ -198,9 +198,9 @@ class AdminType(TypedDict):
 class StatusType(TypedDict):
     name: str
     map: "LayerType"
-    nb_players: str
+    current_players: int
+    max_players: int
     short_name: str
-    player_count: str
     server_number: int
 
 

diff --git a/rcongui/src/components/Header/serverStatus.js b/rcongui/src/components/Header/serverStatus.js
@@ -14,7 +14,8 @@ import { fromJS, List } from "immutable";
 const Status = ({
   classes,
   name,
-  nbPlayers,
+  numCurrentPlayers,
+  maxPlayers,
   map,
   serverList,
   timeRemaining,
@@ -73,8 +74,8 @@ const Status = ({
             })}
           </Menu>
           <small style={{ display: "block" }}>
-            {nbPlayers} ({balance}) - {map.pretty_name} - {timeRemaining} -{" "}
-            {score}
+            {numCurrentPlayers}/{maxPlayers} ({balance}) - {map.pretty_name} -{" "}
+            {timeRemaining} - {score}
           </small>
         </Grid>
       </Grid>
@@ -88,7 +89,8 @@ class ServerStatus extends React.Component {
 
     this.state = {
       name: "",
-      nbPlayers: "",
+      numCurrentPlayers: 0,
+      maxPlayers: 0,
       map: new Map(),
       serverList: List(),
       refreshIntervalSec: 10,
@@ -149,7 +151,8 @@ class ServerStatus extends React.Component {
         this.setState({
           name: data?.result.name,
           map: data?.result.map,
-          nbPlayers: data.result.nb_players,
+          numCurrentPlayers: data.result.current_players,
+          maxPlayers: data.result.max_players,
         });
         document.title = `(${data?.result.player_count}) ${data?.result.short_name}`;
       })
@@ -189,7 +192,8 @@ class ServerStatus extends React.Component {
     const {
       map,
       name,
-      nbPlayers,
+      numCurrentPlayers,
+      maxPlayers,
       serverList,
       rawTimeRemaining,
       axisScore,
@@ -203,7 +207,8 @@ class ServerStatus extends React.Component {
       <Status
         classes={classes}
         name={name}
-        nbPlayers={nbPlayers}
+        numCurrentPlayers={numCurrentPlayers}
+        maxPlayers={maxPlayers}
         map={map}
         serverList={serverList}
         timeRemaining={rawTimeRemaining}