Fix servers with hidden observers being on top

bzlist · Dec 7, 2019 · 62db928 · 62db928
1 parent cf28cf0
commit 62db928
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/components/HomePage.tsx b/src/components/HomePage.tsx
@@ -5,14 +5,9 @@ import {Server, Team} from "../models";
 import {TimeAgo} from ".";
 
 const ServerRow = ({server}: {server: Server}): JSX.Element => {
-  let playersCount = server.playersCount;
-  if(settings.getBool(settings.EXCLUDE_OBSERVERS)){
-    playersCount -= server.teams.filter((team: Team) => team.name === "Observer")[0].players;
-  }
-
   return (
-    <tr key={`${server.address}:${server.port}`} onClick={() => history.push(`/s/${server.address}/${server.port}`)} style={{fontWeight: playersCount > 0 ? "bold" : "inherit"}}>
-      <td>{playersCount}</td>
+    <tr key={`${server.address}:${server.port}`} onClick={() => history.push(`/s/${server.address}/${server.port}`)} style={{fontWeight: server.playersCount > 0 ? "bold" : "inherit"}}>
+      <td>{server.playersCount}</td>
       <td>{server.address}:{server.port}</td>
       <td><img src={`https://countryflags.io/${server.countryCode}/flat/32.png`} alt={server.countryCode} title={server.country}/></td>
       <td title={verboseGameStyle(server.configuration.gameStyle)}>{server.configuration.gameStyle}</td>
@@ -72,6 +67,13 @@ export class HomePage extends React.Component<any, State>{
   getServers(): Server[]{
     let servers = this.state.servers;
 
+    if(settings.getBool(settings.EXCLUDE_OBSERVERS)){
+      servers = servers.map((server: Server) => {
+        server.playersCount -= server.teams.filter((team: Team) => team.name === "Observer")[0].players;
+        return server;
+      });
+    }
+
     if(this.state.sort.startsWith("configuration.")){
       const sort = this.state.sort.replace("configuration.", "");
       servers.sort((a: Server, b: Server) => a.configuration[sort] > b.configuration[sort] ? -this.state.sortOrder : this.state.sortOrder);