From b402e2a74c1f0c14d1eb5b6d29ed1fa12dc402d3 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 16 Aug 2015 22:13:06 -0400
Subject: [PATCH 01/29] servers are stored in an object

Before, all the available servers were hardcoded into the select in the login form of the login page. This made adding new servers a bit more difficult, because an entire new element would have to be added each time, which only leads to copy paste coding.

Now, all the servers are stored in $scope.servers, which is an object that is mapped [server name: server address]. Then, through use of ng-repeat, a new <option> is created for each server under the select.
---
 src/login/controller.js |  7 +++++++
 src/login/login.html    | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 086256f..3a44e7b 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -4,6 +4,13 @@
 function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
     var SUCCESS = 200;
 
+    $scope.servers = {
+        "Local Host": "ws://127.0.0.1:4243",
+        "dwarftowers.com": "ws://dwarftowers.com:4243",
+        "zomis.net": "ws://stats.zomis.net:4243",
+        "Other...": "other"
+    };
+
     $scope.login = function() {
         $scope.loggedIn = true;
         var finalServer = ($scope.server === "other" ? $scope.other_server : $scope.server);
diff --git a/src/login/login.html b/src/login/login.html
index 412eb73..6cb30b2 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -6,14 +6,16 @@
 
 <h4>Please log in to continue, or see below for instructions and assistance.</h4>
 
+<!-- Server status -->
+<div>
+
+</div>
+
 <form name="login_information" id="login_information" class="login-form">
     <div class="form-group">
         <label for="server" aria-label="Server">Server:</label>
         <select ng-model="server" name="server" id="server" class="form-control">
-            <option value="ws://127.0.0.1:4243">Local host</option>
-            <option value="ws://dwarftowers.com:4243">dwarftowers.com</option>
-            <option value="ws://stats.zomis.net:4243">zomis.net</option>
-            <option value="other">Other...</option>
+            <option ng-repeat="(name, address) in servers" value="{{address}}">{{name}}</option>
         </select>
         <label for="secure">Is secure server:</label>
         <input ng-model="is_secure" name="secure" id="secure" type="checkbox" value="secure" />

From fbcbc75791abc72bb5fc0c3c934fcabd6b075c40 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 16 Aug 2015 22:30:34 -0400
Subject: [PATCH 02/29] now server is stored with information like user count
 and latency

Before, servers were stored in an object like this: [name: address]. Of course, this does not include enough information for the user. Is the server online? What about the users? How many of those are these? And the latency? I'm I going to be stuck trying to send a chat message?

Now, the servers are stored in an object like this:

name:
    address
    isOnline
    userCount
    latency
---
 src/login/controller.js | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 3a44e7b..3716f88 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -5,11 +5,31 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
     var SUCCESS = 200;
 
     $scope.servers = {
-        "Local Host": "ws://127.0.0.1:4243",
-        "dwarftowers.com": "ws://dwarftowers.com:4243",
-        "zomis.net": "ws://stats.zomis.net:4243",
-        "Other...": "other"
-    };
+        "Local Host": {
+            address: "ws://127.0.0.1:4243",
+            isOnline: false,
+            userCount: 0,
+            latency: 0
+        },
+        "dwarftowers.com": {
+            address: "ws://dwarftowers.zom:4243",
+            isOnline: false,
+            userCount: 0,
+            latency: 0
+        },
+        "zomis.net": {
+            address: "ws://stats.zomis.net:4243",
+            isOnline: false,
+            userCount: 0,
+            latency: 0
+        },
+        "Other...": {
+            address: "other",
+            isOnline: null,
+            userCount: null,
+            latency: null
+        }
+    }
 
     $scope.login = function() {
         $scope.loggedIn = true;

From a7003003c6c42a2dbeb7a61260069d8b7c32afc8 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 16 Aug 2015 22:31:59 -0400
Subject: [PATCH 03/29] changed html to fit new server storage, setup table for
 server information

At the top of the login page, there is now a table that holds 4 pieces of information for each server: the server name, whether the server is online or not, the amount of users on the server, and the latency of the user's connection to the server
---
 src/login/login.html | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/login/login.html b/src/login/login.html
index 6cb30b2..08e1cae 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -8,14 +8,27 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
 
 <!-- Server status -->
 <div>
-
+    <table>
+        <tr>
+            <td>Server</td>
+            <td>Online</td>
+            <td>Users</td>
+            <td>Latency</td>
+        </tr>
+        <tr ng-repeat="(name, info) in servers" ng-if="name !== 'Other...'">
+            <td>{{name}}</td>
+            <td>{{info.isOnline}}</td>
+            <td>{{info.userCount}} users</td>
+            <td>{{info.latency}} ms</td>
+        </tr>
+    </table>
 </div>
 
 <form name="login_information" id="login_information" class="login-form">
     <div class="form-group">
         <label for="server" aria-label="Server">Server:</label>
         <select ng-model="server" name="server" id="server" class="form-control">
-            <option ng-repeat="(name, address) in servers" value="{{address}}">{{name}}</option>
+            <option ng-repeat="(name, info) in servers" value="{{info.address}}">{{name}}</option>
         </select>
         <label for="secure">Is secure server:</label>
         <input ng-model="is_secure" name="secure" id="secure" type="checkbox" value="secure" />

From 57707f6232131b8293fac8aedacc98f6d41ce9de Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 16 Aug 2015 22:44:47 -0400
Subject: [PATCH 04/29] added <b> around column names to make more prominent

---
 src/login/login.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/login/login.html b/src/login/login.html
index 08e1cae..ffe27b0 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -10,10 +10,10 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
 <div>
     <table>
         <tr>
-            <td>Server</td>
-            <td>Online</td>
-            <td>Users</td>
-            <td>Latency</td>
+            <td><b>Server</b></td>
+            <td><b>Online</b></td>
+            <td><b>Users</b></td>
+            <td><b>Latency</b></td>
         </tr>
         <tr ng-repeat="(name, info) in servers" ng-if="name !== 'Other...'">
             <td>{{name}}</td>

From 9635c9279baa1fd42909968f4c86b096de7584fc Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 16 Aug 2015 22:46:14 -0400
Subject: [PATCH 05/29] added updateStats function

The updateStats function so far initializes the API and gets a latency count by storing the time before the init call and getting the time after, and the code can easily find out if the server is online if the connection is made at all.

This currently does not work and is being tested.
---
 src/login/controller.js | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 3716f88..30e6411 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -1,9 +1,11 @@
 'use strict';
 
 // @ngInject
-function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
+function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $interval) {
     var SUCCESS = 200;
 
+    $interval(updateStats, 2000);
+
     $scope.servers = {
         "Local Host": {
             address: "ws://127.0.0.1:4243",
@@ -75,6 +77,25 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
             $scope.$apply();
         });
     }
+
+    function updateStats() {
+        for(var server in $scope.servers) {
+            if($scope.servers.hasOwnProperty(server)) {
+                var thisServer = $scope.servers[server];
+
+                var now = Date.now();
+                CardshifterServerAPI.init(thisServer.address, false, function() {
+                    thisServer.latency = Date.now() - now;
+                    thisServer.isOnline = true;
+
+                }, function() {
+                    thisServer.isOnline = false;
+                    thisServer.latency = 0;
+                    thisServer.userCount = 0;
+                });
+            }
+        }
+    }
 };
 
 module.exports = LoginController;

From 4bc02038f87a00e420b34afc0958d6b8a51d5d3c Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 16 Aug 2015 22:51:34 -0400
Subject: [PATCH 06/29] fixed typo in server map, added checking in updateStats
 so there is no checking for "Other..."

Now the code sort of works. It will only display information for stats.zomis.net, but the latency is blown out of proportion: I was reaching 2000+ ms. I think the reason for this is because the server is being queried to quickly, so by the time init's third parameter runs, it is using an old local `now` variable.

Another issue: this will not recognize a local host server.
---
 src/login/controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 30e6411..50de0f1 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -14,7 +14,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $i
             latency: 0
         },
         "dwarftowers.com": {
-            address: "ws://dwarftowers.zom:4243",
+            address: "ws://dwarftowers.com:4243",
             isOnline: false,
             userCount: 0,
             latency: 0
@@ -80,7 +80,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $i
 
     function updateStats() {
         for(var server in $scope.servers) {
-            if($scope.servers.hasOwnProperty(server)) {
+            if($scope.servers.hasOwnProperty(server) && server !== "Other...") {
                 var thisServer = $scope.servers[server];
 
                 var now = Date.now();

From 2dfe989589dad8bf419e4f346270a79e5099958f Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 16 Aug 2015 22:57:46 -0400
Subject: [PATCH 07/29] added refresh button

Instead of checking the server stats every 2 seconds, there is now a refresh button. There are still some bugs to be worked out, for example, if the server does not exist (local host), then the code dies. And, if the server does exist, the code may sit waiting for a response indefinitely, even though one may never be received. And, this refersh button allows for an easy attempt of a DoS on the server.

Maybe this idea should be put off for a little while.
---
 src/login/controller.js | 6 ++----
 src/login/login.html    | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 50de0f1..d0c06ce 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -1,11 +1,9 @@
 'use strict';
 
 // @ngInject
-function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $interval) {
+function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
     var SUCCESS = 200;
 
-    $interval(updateStats, 2000);
-
     $scope.servers = {
         "Local Host": {
             address: "ws://127.0.0.1:4243",
@@ -78,7 +76,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $i
         });
     }
 
-    function updateStats() {
+    $scope.updateStats = function() {
         for(var server in $scope.servers) {
             if($scope.servers.hasOwnProperty(server) && server !== "Other...") {
                 var thisServer = $scope.servers[server];
diff --git a/src/login/login.html b/src/login/login.html
index ffe27b0..da6e599 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -22,6 +22,7 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
             <td>{{info.latency}} ms</td>
         </tr>
     </table>
+    <input ng-click="updateStats()" type="button" value="Refresh" />
 </div>
 
 <form name="login_information" id="login_information" class="login-form">

From b3fb3df40485c53a75379e15a05fc2a2753a38bd Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 30 Aug 2015 12:10:09 -0400
Subject: [PATCH 08/29] added ServerInfos class

This class is used to store information about each server for the server status table. It holds information like the user count, the latency, and whether or not the server is online.
---
 src/login/controller.js | 51 ++++++++++++++++++++---------------------
 src/login/login.html    | 14 +++++------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index d0c06ce..8f9db37 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -4,32 +4,12 @@
 function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
     var SUCCESS = 200;
 
-    $scope.servers = {
-        "Local Host": {
-            address: "ws://127.0.0.1:4243",
-            isOnline: false,
-            userCount: 0,
-            latency: 0
-        },
-        "dwarftowers.com": {
-            address: "ws://dwarftowers.com:4243",
-            isOnline: false,
-            userCount: 0,
-            latency: 0
-        },
-        "zomis.net": {
-            address: "ws://stats.zomis.net:4243",
-            isOnline: false,
-            userCount: 0,
-            latency: 0
-        },
-        "Other...": {
-            address: "other",
-            isOnline: null,
-            userCount: null,
-            latency: null
-        }
-    }
+    $scope.servers = [
+        new ServerInfo("Local Host", "ws://127.0.0.1:4243"),
+        new ServerInfo("Dwarf Towers", "ws://dwarftowers.com:4243"),
+        new ServerInfo("Zomis.net", "ws://stats.zomis.net:4243"),
+        new ServerInfo("Other...", null)
+    ];
 
     $scope.login = function() {
         $scope.loggedIn = true;
@@ -94,6 +74,25 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
             }
         }
     }
+    
+    /**
+    * The ServerInfo class.
+    * @constructor
+    *
+    * @param name:string -- The name of the server
+    * @param address:string -- The address of the server
+    *
+    * This class is used for displaying the various
+    * available servers at the top of the screen
+    * in the server status table.
+    */
+    function ServerInfo(name, address) {
+        this.name = name;
+        this.address = address;
+        this.isOnline = false;
+        this.userCount = 0;
+        this.latency = 0;
+    }
 };
 
 module.exports = LoginController;
diff --git a/src/login/login.html b/src/login/login.html
index da6e599..d94b1c4 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -15,11 +15,11 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
             <td><b>Users</b></td>
             <td><b>Latency</b></td>
         </tr>
-        <tr ng-repeat="(name, info) in servers" ng-if="name !== 'Other...'">
-            <td>{{name}}</td>
-            <td>{{info.isOnline}}</td>
-            <td>{{info.userCount}} users</td>
-            <td>{{info.latency}} ms</td>
+        <tr ng-repeat="server in servers" ng-if="server.name !== 'Other...'">
+            <td>{{server.name}}</td>
+            <td>{{server.isOnline}}</td>
+            <td>{{server.userCount}} users</td>
+            <td>{{server.latency}} ms</td>
         </tr>
     </table>
     <input ng-click="updateStats()" type="button" value="Refresh" />
@@ -29,7 +29,7 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
     <div class="form-group">
         <label for="server" aria-label="Server">Server:</label>
         <select ng-model="server" name="server" id="server" class="form-control">
-            <option ng-repeat="(name, info) in servers" value="{{info.address}}">{{name}}</option>
+            <option ng-repeat="server in servers" value="{{server.address}}">{{server.name}}</option>
         </select>
         <label for="secure">Is secure server:</label>
         <input ng-model="is_secure" name="secure" id="secure" type="checkbox" value="secure" />
@@ -81,4 +81,4 @@ <h3 style="text-decoration: underline;">About Cardshifter</h3>
 <ul>
     <li><h4><a href="http://stats.zomis.net/io-web">Official Website</a></h4></li>
     <li><h4><a href="https://github.com/Cardshifter">On GitHub</a></h4></li>
-</ul>
\ No newline at end of file
+</ul>

From 680e8e43f415a612f88dc6b6f6ccece433f3d280 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 30 Aug 2015 12:20:19 -0400
Subject: [PATCH 09/29] fixed bug where the final server would not be
 recognized

Before, when the ServerInfo object was being created for "Other", the name was set to null. However, the login code checks to see if it is equal to "other", so this was changed: null --> "other"
---
 src/login/controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 8f9db37..66045bd 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -8,7 +8,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
         new ServerInfo("Local Host", "ws://127.0.0.1:4243"),
         new ServerInfo("Dwarf Towers", "ws://dwarftowers.com:4243"),
         new ServerInfo("Zomis.net", "ws://stats.zomis.net:4243"),
-        new ServerInfo("Other...", null)
+        new ServerInfo("Other...", "other")
     ];
 
     $scope.login = function() {

From b59aba93765ea184274d5727fe345ad6d94e202b Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Mon, 31 Aug 2015 19:50:27 -0400
Subject: [PATCH 10/29] now gets server information, except for users online
 count

This has a bug: the HTML is not updated.  Perhaps this has to do with the fact that this is async.
---
 src/login/controller.js | 38 +++++++++++++++++++++-----------------
 src/login/login.html    |  1 -
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 66045bd..54cf6ba 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -1,8 +1,9 @@
 'use strict';
 
 // @ngInject
-function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
+function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $interval) {
     var SUCCESS = 200;
+    var UPDATE_DELAY = 10000;
 
     $scope.servers = [
         new ServerInfo("Local Host", "ws://127.0.0.1:4243"),
@@ -56,25 +57,28 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
         });
     }
 
-    $scope.updateStats = function() {
-        for(var server in $scope.servers) {
-            if($scope.servers.hasOwnProperty(server) && server !== "Other...") {
-                var thisServer = $scope.servers[server];
+    $interval(function updateServers() {
+        for(var i = 0, length = $scope.servers.length; i < length; i++) {
+            var thisServer = $scope.servers[i];
 
-                var now = Date.now();
-                CardshifterServerAPI.init(thisServer.address, false, function() {
-                    thisServer.latency = Date.now() - now;
-                    thisServer.isOnline = true;
-
-                }, function() {
-                    thisServer.isOnline = false;
-                    thisServer.latency = 0;
-                    thisServer.userCount = 0;
-                });
+            if(thisServer.name === "Other...") {
+                return;
             }
+
+            var now = Date.now();
+
+            CardshifterServerAPI.init(thisServer.address, false, function() {
+                thisServer.latency = Date.now() - now;
+                thisServer.isOnline = true;
+            }, function() {
+                thisServer.latency = 0;
+                thisServer.isOnline = false;
+                thisServer.userCount = 0;
+            });
         }
-    }
-    
+
+    }, UPDATE_DELAY);
+
     /**
     * The ServerInfo class.
     * @constructor
diff --git a/src/login/login.html b/src/login/login.html
index d94b1c4..eb0cf46 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -22,7 +22,6 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
             <td>{{server.latency}} ms</td>
         </tr>
     </table>
-    <input ng-click="updateStats()" type="button" value="Refresh" />
 </div>
 
 <form name="login_information" id="login_information" class="login-form">

From 83012cfffbd0e37300a8e6ac449eabcfc08758eb Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Tue, 1 Sep 2015 11:35:58 -0400
Subject: [PATCH 11/29] added refresh button to server stats

When this button is clicked, the server stats table is updated with the information about the servers.
---
 src/login/controller.js | 6 +++---
 src/login/login.html    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 54cf6ba..18b51e9 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // @ngInject
-function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $interval) {
+function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
     var SUCCESS = 200;
     var UPDATE_DELAY = 10000;
 
@@ -57,7 +57,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $i
         });
     }
 
-    $interval(function updateServers() {
+    $scope.refreshServers = function() {
         for(var i = 0, length = $scope.servers.length; i < length; i++) {
             var thisServer = $scope.servers[i];
 
@@ -77,7 +77,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $i
             });
         }
 
-    }, UPDATE_DELAY);
+    };
 
     /**
     * The ServerInfo class.
diff --git a/src/login/login.html b/src/login/login.html
index eb0cf46..2c84339 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -22,6 +22,7 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
             <td>{{server.latency}} ms</td>
         </tr>
     </table>
+    <input ng-click="refreshServers()" type="button" value="Refresh"/>
 </div>
 
 <form name="login_information" id="login_information" class="login-form">

From 5544c6c9d78e536aa9a6f38b068116bdde3bf16b Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Tue, 1 Sep 2015 11:41:23 -0400
Subject: [PATCH 12/29] Revert "added refresh button to server stats"

This reverts commit 83012cfffbd0e37300a8e6ac449eabcfc08758eb.
---
 src/login/controller.js | 6 +++---
 src/login/login.html    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 18b51e9..54cf6ba 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // @ngInject
-function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
+function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $interval) {
     var SUCCESS = 200;
     var UPDATE_DELAY = 10000;
 
@@ -57,7 +57,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
         });
     }
 
-    $scope.refreshServers = function() {
+    $interval(function updateServers() {
         for(var i = 0, length = $scope.servers.length; i < length; i++) {
             var thisServer = $scope.servers[i];
 
@@ -77,7 +77,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
             });
         }
 
-    };
+    }, UPDATE_DELAY);
 
     /**
     * The ServerInfo class.
diff --git a/src/login/login.html b/src/login/login.html
index 2c84339..eb0cf46 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -22,7 +22,6 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
             <td>{{server.latency}} ms</td>
         </tr>
     </table>
-    <input ng-click="refreshServers()" type="button" value="Refresh"/>
 </div>
 
 <form name="login_information" id="login_information" class="login-form">

From 3159b471c3fc26f7793fec5e94cd38cec5b895c9 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Tue, 1 Sep 2015 11:59:46 -0400
Subject: [PATCH 13/29] Revert "Revert "added refresh button to server stats""

This reverts commit 5544c6c9d78e536aa9a6f38b068116bdde3bf16b.
---
 src/login/controller.js | 6 +++---
 src/login/login.html    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 54cf6ba..18b51e9 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // @ngInject
-function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $interval) {
+function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
     var SUCCESS = 200;
     var UPDATE_DELAY = 10000;
 
@@ -57,7 +57,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $i
         });
     }
 
-    $interval(function updateServers() {
+    $scope.refreshServers = function() {
         for(var i = 0, length = $scope.servers.length; i < length; i++) {
             var thisServer = $scope.servers[i];
 
@@ -77,7 +77,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $i
             });
         }
 
-    }, UPDATE_DELAY);
+    };
 
     /**
     * The ServerInfo class.
diff --git a/src/login/login.html b/src/login/login.html
index eb0cf46..2c84339 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -22,6 +22,7 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
             <td>{{server.latency}} ms</td>
         </tr>
     </table>
+    <input ng-click="refreshServers()" type="button" value="Refresh"/>
 </div>
 
 <form name="login_information" id="login_information" class="login-form">

From 1f5ca3ed20fc970964dfd748f7a0d26f35368490 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Tue, 1 Sep 2015 12:09:21 -0400
Subject: [PATCH 14/29] added delay for refresh button

Now, the user can only hit the refresh button only every 3 seconds
---
 src/login/controller.js | 11 +++++++++--
 src/login/login.html    |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 18b51e9..7233a5d 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -1,9 +1,12 @@
 'use strict';
 
 // @ngInject
-function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
+function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $timeout) {
     var SUCCESS = 200;
     var UPDATE_DELAY = 10000;
+    var REFRESH_DELAY = 3000;
+
+    $scope.refreshing = false;
 
     $scope.servers = [
         new ServerInfo("Local Host", "ws://127.0.0.1:4243"),
@@ -76,7 +79,11 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope) {
                 thisServer.userCount = 0;
             });
         }
-
+        
+        $scope.refreshing = true;
+        $timeout(function() {
+            $scope.refreshing = false;
+        }, REFRESH_DELAY);
     };
 
     /**
diff --git a/src/login/login.html b/src/login/login.html
index 2c84339..9ff6703 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -22,7 +22,7 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
             <td>{{server.latency}} ms</td>
         </tr>
     </table>
-    <input ng-click="refreshServers()" type="button" value="Refresh"/>
+    <input ng-click="refreshServers()" ng-disabled="{{refreshing}}" type="button" value="Refresh"/>
 </div>
 
 <form name="login_information" id="login_information" class="login-form">

From 8148b24929a704455c2258739ae9f1f65c04253d Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sat, 5 Sep 2015 22:13:11 -0400
Subject: [PATCH 15/29] CardshifterServerAPI.init is now called by passing
 anonymous functions with the local variables passed into it.

Before, when this loop inside $scope.refreshServers was running, since API.init is async, the loop would finish instantly and the local `thisServer` would be the very last server in the list. Now, an anonymous function is passed to the init method that is given the current server when it is passed in so it does not change in that function's scope.
---
 src/login/controller.js | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 7233a5d..32b5eb5 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -62,22 +62,32 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
 
     $scope.refreshServers = function() {
         for(var i = 0, length = $scope.servers.length; i < length; i++) {
-            var thisServer = $scope.servers[i];
-
-            if(thisServer.name === "Other...") {
-                return;
+            if($scope.servers[i].name === "Other...") {
+                continue;
             }
 
             var now = Date.now();
 
-            CardshifterServerAPI.init(thisServer.address, false, function() {
-                thisServer.latency = Date.now() - now;
-                thisServer.isOnline = true;
-            }, function() {
-                thisServer.latency = 0;
-                thisServer.isOnline = false;
-                thisServer.userCount = 0;
-            });
+            /**
+            * The reason why there is all this anonymous function
+            * returning anonymous function magic is because this
+            * init method happens asynchronously, and that means
+            * that the local thisServer variable is going to change
+            * almost instantaneously to the very last server in the
+            * list.
+            */
+            CardshifterServerAPI.init($scope.servers[i].address, false, (function(thisServer) {
+                return function() {
+                    thisServer.latency = Date.now() - now;
+                    thisServer.isOnline = true;
+                }
+            })($scope.servers[i]), (function(thisServer) {
+                return function() {
+                    thisServer.latency = 0;
+                    thisServer.isOnline = false;
+                    thisServer.userCount = 0;
+                }
+            }));
         }
         
         $scope.refreshing = true;

From cee375b76be03ed74ec14392b350127a489e408e Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sat, 5 Sep 2015 23:17:02 -0400
Subject: [PATCH 16/29] working on $scope.refreshing

It is quite easy to attempt and crash a server just by smashing the "refresh" button. Right now, there is an interval setup to disable this button for a certain amount of time, but it still needs some work (aka: it doesn't work)
---
 src/login/controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 32b5eb5..6e10a05 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -61,6 +61,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
     }
 
     $scope.refreshServers = function() {
+        $scope.refreshing = true;
         for(var i = 0, length = $scope.servers.length; i < length; i++) {
             if($scope.servers[i].name === "Other...") {
                 continue;
@@ -89,8 +90,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
                 }
             }));
         }
-        
-        $scope.refreshing = true;
+
         $timeout(function() {
             $scope.refreshing = false;
         }, REFRESH_DELAY);

From 8ad2e84885075572a77775239d96eacac88a5c78 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 6 Sep 2015 13:18:23 -0400
Subject: [PATCH 17/29] cleaned up code

The two anonymous functions that were being passed to API.init have been removed. Now, the entire API.init call is encased in an anonymous function.
---
 src/login/controller.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 6e10a05..259f2a8 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -77,18 +77,16 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
             * almost instantaneously to the very last server in the
             * list.
             */
-            CardshifterServerAPI.init($scope.servers[i].address, false, (function(thisServer) {
-                return function() {
+            (function(thisServer) {
+                CardshifterServerAPI.init(thisServer.address, false, function() {
                     thisServer.latency = Date.now() - now;
                     thisServer.isOnline = true;
-                }
-            })($scope.servers[i]), (function(thisServer) {
-                return function() {
+                }, function() {
                     thisServer.latency = 0;
                     thisServer.isOnline = false;
                     thisServer.userCount = 0;
-                }
-            }));
+                })
+            })($scope.servers[i]);
         }
 
         $timeout(function() {

From a2130a002a375b81053de74e6f35b54295daddde Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 6 Sep 2015 16:37:05 -0400
Subject: [PATCH 18/29] fixed issue where refresh button was not becoming
 disabled

---
 src/login/controller.js | 8 ++++----
 src/login/login.html    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 259f2a8..a199222 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -62,6 +62,10 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
 
     $scope.refreshServers = function() {
         $scope.refreshing = true;
+        $timeout(function() {
+            $scope.refreshing = false;
+        }, REFRESH_DELAY);
+
         for(var i = 0, length = $scope.servers.length; i < length; i++) {
             if($scope.servers[i].name === "Other...") {
                 continue;
@@ -88,10 +92,6 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
                 })
             })($scope.servers[i]);
         }
-
-        $timeout(function() {
-            $scope.refreshing = false;
-        }, REFRESH_DELAY);
     };
 
     /**
diff --git a/src/login/login.html b/src/login/login.html
index 9ff6703..f2a7342 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -22,7 +22,7 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
             <td>{{server.latency}} ms</td>
         </tr>
     </table>
-    <input ng-click="refreshServers()" ng-disabled="{{refreshing}}" type="button" value="Refresh"/>
+    <input ng-click="refreshServers()" ng-disabled="refreshing" type="button" value="Refresh"/>
 </div>
 
 <form name="login_information" id="login_information" class="login-form">

From 1aa024f264564072bd6ce1387dc36b96dcab7a53 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 6 Sep 2015 18:41:50 -0400
Subject: [PATCH 19/29] fixed problem where refreshing created blank users

Fixes #92
---
 src/login/controller.js | 50 +++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index a199222..ac9f1c9 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -66,32 +66,38 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
             $scope.refreshing = false;
         }, REFRESH_DELAY);
 
-        for(var i = 0, length = $scope.servers.length; i < length; i++) {
-            if($scope.servers[i].name === "Other...") {
-                continue;
+        var i = 0;
+        (function foo() {
+            var thisServer = $scope.servers[i];
+
+            if(thisServer.name === "Other...") {
+                return;
             }
 
             var now = Date.now();
 
-            /**
-            * The reason why there is all this anonymous function
-            * returning anonymous function magic is because this
-            * init method happens asynchronously, and that means
-            * that the local thisServer variable is going to change
-            * almost instantaneously to the very last server in the
-            * list.
-            */
-            (function(thisServer) {
-                CardshifterServerAPI.init(thisServer.address, false, function() {
-                    thisServer.latency = Date.now() - now;
-                    thisServer.isOnline = true;
-                }, function() {
-                    thisServer.latency = 0;
-                    thisServer.isOnline = false;
-                    thisServer.userCount = 0;
-                })
-            })($scope.servers[i]);
-        }
+            CardshifterServerAPI.init(thisServer.address, false, function() {
+                thisServer.latency = Date.now() - now;
+                thisServer.isOnline = true;
+
+                CardshifterServerAPI.socket.close();
+                CardshifterServerAPI.socket = null;
+
+                i++;
+                if($scope.servers[i]) {
+                    foo();
+                }
+            }, function() {
+                thisServer.latency = 0;
+                thisServer.isOnline = false;
+                thisServer.userCount = 0;
+
+                i++;
+                if($scope.servers[i]) {
+                    foo();
+                }
+            })
+        })();
     };
 
     /**

From a03738f2e1590d3e1698b40d58acda96e4a118d9 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 6 Sep 2015 19:34:37 -0400
Subject: [PATCH 20/29] fixed naming

---
 src/login/controller.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index ac9f1c9..6264084 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -66,8 +66,10 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
             $scope.refreshing = false;
         }, REFRESH_DELAY);
 
+        /**
+        */
         var i = 0;
-        (function foo() {
+        (function getServerInfo() {
             var thisServer = $scope.servers[i];
 
             if(thisServer.name === "Other...") {
@@ -85,7 +87,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
 
                 i++;
                 if($scope.servers[i]) {
-                    foo();
+                    getServerInfo();
                 }
             }, function() {
                 thisServer.latency = 0;
@@ -94,7 +96,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
 
                 i++;
                 if($scope.servers[i]) {
-                    foo();
+                    getServerInfo();
                 }
             })
         })();

From e676e997d9fe3a3dc610a652a10d9e5cf20fb41c Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 6 Sep 2015 19:36:46 -0400
Subject: [PATCH 21/29] added "Refreshing..." message so user is not confused
 by delay

---
 src/login/login.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/login/login.html b/src/login/login.html
index f2a7342..0163559 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -23,6 +23,7 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
         </tr>
     </table>
     <input ng-click="refreshServers()" ng-disabled="refreshing" type="button" value="Refresh"/>
+    <p ng-show="refreshing">Refreshing...</p>
 </div>
 
 <form name="login_information" id="login_information" class="login-form">

From 1626fddcdb6d153ea86a18f5645806dd28920bd6 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 6 Sep 2015 19:47:09 -0400
Subject: [PATCH 22/29] added documentation

---
 src/login/controller.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/login/controller.js b/src/login/controller.js
index 6264084..052b3ed 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -67,6 +67,16 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
         }, REFRESH_DELAY);
 
         /**
+        * This is a recursive function that is called
+        * once the Websocket has successfully connected
+        * with the server. Once it is connected, the
+        * Websocket is obliterated.
+        *
+        * This is used in place of the loop because
+        * API.init is a mostly async method, so the
+        * loop would rapidly terminate, and the sockets
+        * will be destroyed at the incorrect points in
+        * order for the "blank users"(#92) to be prevented.
         */
         var i = 0;
         (function getServerInfo() {

From a9bd78936000f53b0a7df173dd8f9e7083ac8374 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Tue, 8 Sep 2015 20:17:16 -0400
Subject: [PATCH 23/29] now grabs user count

---
 src/login/controller.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 052b3ed..80ea226 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -92,13 +92,23 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
                 thisServer.latency = Date.now() - now;
                 thisServer.isOnline = true;
 
-                CardshifterServerAPI.socket.close();
-                CardshifterServerAPI.socket = null;
+                /* This must be created here because this is run after init is don't, so command is set properly */
+                var getUsers = new CardshifterServerAPI.messageTypes.ServerQueryMessage("STATUS", "");
 
-                i++;
-                if($scope.servers[i]) {
-                    getServerInfo();
-                }
+                CardshifterServerAPI.sendMessage(getUsers);
+                CardshifterServerAPI.setMessageListener(function(message) {
+
+                    /* For some reason, local host always said 1 user online, but dwarftowers did not. */
+                    thisServer.userCount = Math.abs(message.users - 1);
+
+                    CardshifterServerAPI.socket.close();
+                    CardshifterServerAPI.socket = null;
+
+                    i++;
+                    if($scope.servers[i]) {
+                        getServerInfo();
+                    }
+                }, ["status"]);
             }, function() {
                 thisServer.latency = 0;
                 thisServer.isOnline = false;
@@ -110,6 +120,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
                 }
             })
         })();
+        console.log("gudbai");
     };
 
     /**

From a3b74eb1c99177946cf21700b46db384235cea56 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Tue, 8 Sep 2015 20:17:57 -0400
Subject: [PATCH 24/29] corrected checking for a blank eventTypes array

Apparently, [] in javascript is a truth value, so just checking if(eventTypes) will always be true as long as eventTypes is an array.
---
 src/server_interface/server_interface.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server_interface/server_interface.js b/src/server_interface/server_interface.js
index fd65ac7..fabf383 100644
--- a/src/server_interface/server_interface.js
+++ b/src/server_interface/server_interface.js
@@ -284,7 +284,7 @@ var CardshifterServerAPI = {
 
         this.socket.onmessage = function(message) {
             var data = JSON.parse(message.data);
-            if(eventTypes) {
+            if(eventTypes !== []) {
                 if(eventTypes.indexOf(data.command) !== -1) { // if contains
                     listener(data);
                 }

From 54e18bf5c390c6a87e7e51dd1fde94a9b7204a20 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Tue, 8 Sep 2015 20:23:19 -0400
Subject: [PATCH 25/29] removed annoying console.log

---
 src/login/controller.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 80ea226..823ff5f 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -120,7 +120,6 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
                 }
             })
         })();
-        console.log("gudbai");
     };
 
     /**

From 3bdbecc414a44ffb644d140182b96664db4a2227 Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Thu, 10 Sep 2015 18:44:15 -0400
Subject: [PATCH 26/29] removed removal of one user

---
 src/login/controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/login/controller.js b/src/login/controller.js
index 823ff5f..afed308 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -99,7 +99,7 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
                 CardshifterServerAPI.setMessageListener(function(message) {
 
                     /* For some reason, local host always said 1 user online, but dwarftowers did not. */
-                    thisServer.userCount = Math.abs(message.users - 1);
+                    thisServer.userCount = message.users;
 
                     CardshifterServerAPI.socket.close();
                     CardshifterServerAPI.socket = null;

From 4414b47a226d04f8524dc06f6dd7dcb3083502bf Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Thu, 10 Sep 2015 18:58:30 -0400
Subject: [PATCH 27/29] changed <td><b> to <th>, added more columns

---
 src/login/login.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/login/login.html b/src/login/login.html
index 0163559..62d87cb 100644
--- a/src/login/login.html
+++ b/src/login/login.html
@@ -9,16 +9,23 @@ <h4>Please log in to continue, or see below for instructions and assistance.</h4
 <!-- Server status -->
 <div>
     <table>
+        <!-- Should these be dynamically loaded? -->
         <tr>
-            <td><b>Server</b></td>
-            <td><b>Online</b></td>
-            <td><b>Users</b></td>
-            <td><b>Latency</b></td>
+            <th>Server</th>
+            <th>Online</th>
+            <th>Users</th>
+            <th>Mods</th>
+            <th>Games</th>
+            <th>AIs</th>
+            <th>Latency</th>
         </tr>
         <tr ng-repeat="server in servers" ng-if="server.name !== 'Other...'">
             <td>{{server.name}}</td>
             <td>{{server.isOnline}}</td>
             <td>{{server.userCount}} users</td>
+            <td>{{server.availableMods}} mods</td>
+            <td>{{server.gamesRunning}} games</td>
+            <td>{{server.ais}} AIs</td>
             <td>{{server.latency}} ms</td>
         </tr>
     </table>

From da7a2b0b639957b48a257ff05626ebeb42e531ed Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Thu, 10 Sep 2015 18:58:54 -0400
Subject: [PATCH 28/29] now grabs mod amount, game amount, and AI amount for
 server stats

---
 src/login/controller.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/login/controller.js b/src/login/controller.js
index afed308..1d1e112 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -100,6 +100,11 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
 
                     /* For some reason, local host always said 1 user online, but dwarftowers did not. */
                     thisServer.userCount = message.users;
+                    thisServer.availableMods = message.mods.length;
+                    thisServer.gamesRunning = message.games;
+                    thisServer.ais = message.ais;
+
+                    // Should these (^^) be dynamically loaded?
 
                     CardshifterServerAPI.socket.close();
                     CardshifterServerAPI.socket = null;
@@ -139,6 +144,9 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
         this.isOnline = false;
         this.userCount = 0;
         this.latency = 0;
+        this.availableMods = 0;
+        this.gamesRunning = 0;
+        this.ais = 0;
     }
 };
 

From c87da4df80de0ad46865fd3dde2dcb233893365a Mon Sep 17 00:00:00 2001
From: SirPython <SirPython@users.noreply.github.com>
Date: Sun, 20 Sep 2015 13:12:11 -0400
Subject: [PATCH 29/29] the server stats are now loaded/refreshed on page load

---
 src/login/controller.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/login/controller.js b/src/login/controller.js
index 1d1e112..251bb97 100644
--- a/src/login/controller.js
+++ b/src/login/controller.js
@@ -127,6 +127,8 @@ function LoginController(CardshifterServerAPI, $scope, $location, $rootScope, $t
         })();
     };
 
+    $scope.refreshServers(); // call it on startup
+
     /**
     * The ServerInfo class.
     * @constructor