Add number of online observers to server list

bzlist · Aug 6, 2019 · 7b6013f · 7b6013f
1 parent 934fe72
commit 7b6013f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/app/components/servers/servers.component.html b/src/app/components/servers/servers.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="ready && serversService.servers" class="container">
   <h2>{{serversService.servers.length + " Public Server" | autoPlural}} Online</h2>
-  <small>{{serversService.playerCount + " player" | autoPlural}} online. Last update was {{serversService.lastUpdate | timeAgo}}.</small>
+  <small>{{serversService.playerCount + " player" | autoPlural}} and {{serversService.observerCount + " observer" | autoPlural}} online. Last update was {{serversService.lastUpdate | timeAgo}}.</small>
 </div>
 <div *ngIf="ready && serversService.servers">
   <app-servers-table *ngIf="!settingsService.gridView" [servers]="serversService.servers" (rowClick)="showServerDetails($event)"></app-servers-table>

diff --git a/src/app/services/servers.service.ts b/src/app/services/servers.service.ts
@@ -13,6 +13,7 @@ export class ServersService{
 
   lastUpdate = -1;
   playerCount = 0;
+  observerCount = 0;
 
   constructor(@Inject(PLATFORM_ID) platformId: string,
               private afs: AngularFirestore){
@@ -32,11 +33,18 @@ export class ServersService{
 
   private setServers(servers: Server[]): void{
     this.playerCount = 0;
+    this.observerCount = 0;
 
     let timestamp = 0;
     for(let i = 0; i < servers.length; i++){
       this.playerCount += servers[i].playersCount;
 
+      const observerTeam = servers[i].teams.find((team) => team.name === "Observer");
+      if(observerTeam){
+        this.observerCount += observerTeam.players;
+        this.playerCount -= observerTeam.players;
+      }
+
       if(servers[i].timestamp > timestamp){
         timestamp = servers[i].timestamp;
       }