From cd4bd680fbb9a4da8013ae28c0e296823c6418ad Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 14 May 2019 13:59:37 +1000
Subject: [PATCH] various niceties" "

---
 client/src/components/instance.create.form.jsx | 6 +++---
 client/src/components/spawn.button.jsx         | 7 ++++---
 client/src/socket.jsx                          | 4 ++--
 server/src/game.rs                             | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/src/components/instance.create.form.jsx b/client/src/components/instance.create.form.jsx
index 8f627ade..b3230714 100644
--- a/client/src/components/instance.create.form.jsx
+++ b/client/src/components/instance.create.form.jsx
@@ -30,7 +30,7 @@ class InstanceCreateForm extends Component {
 
         this.sendInstanceNew = sendInstanceNew.bind(this);
 
-        this.nameChange = this.nameChange.bind(this);
+        this.nameInput = this.nameInput.bind(this);
         this.playersChange = this.playersChange.bind(this);
         this.handleSubmit = this.handleSubmit.bind(this);
     }
@@ -39,7 +39,7 @@ class InstanceCreateForm extends Component {
         this.setState({ players: Number(event.target.value) });
     }
 
-    nameChange(event) {
+    nameInput(event) {
         this.setState({ name: event.target.value });
     }
 
@@ -63,7 +63,7 @@ class InstanceCreateForm extends Component {
                         disabled={disabled}
                         value={this.state.name}
                         placeholder="name"
-                        onChange={this.nameChange}
+                        onInput={this.nameInput}
                     />
                     <label htmlFor="playerSelect">players</label>
                     <select id="playerSelect"
diff --git a/client/src/components/spawn.button.jsx b/client/src/components/spawn.button.jsx
index b81b2e45..34588e34 100644
--- a/client/src/components/spawn.button.jsx
+++ b/client/src/components/spawn.button.jsx
@@ -7,12 +7,13 @@ class SpawnButton extends Component {
 
         this.state = { value: null, enabled: false };
 
-        this.handleChange = this.handleChange.bind(this);
+        this.handleInput = this.handleInput.bind(this);
         this.handleSubmit = this.handleSubmit.bind(this);
         this.enable = this.enable.bind(this);
     }
 
-    handleChange(event) {
+    handleInput(event) {
+        console.log(event.target.value);
         this.setState({ value: event.target.value });
     }
 
@@ -41,7 +42,7 @@ class SpawnButton extends Component {
                         disabled={!this.state.enabled}
                         value={this.state.value}
                         placeholder="name"
-                        onChange={this.handleChange}
+                        onInput={this.handleInput}
                     />
                     <button
                         className="login-btn"
diff --git a/client/src/socket.jsx b/client/src/socket.jsx
index b0a6a438..610dd8bd 100644
--- a/client/src/socket.jsx
+++ b/client/src/socket.jsx
@@ -29,7 +29,7 @@ function createSocket(events) {
     //   Outgoing
     // -------------
     function send(msg) {
-        console.log('outgoing msg', msg);
+        if (msg.method !== 'ping') console.log('outgoing msg', msg);
         msg.token = account && account.token && account.token;
         ws.send(cbor.encode(msg));
     }
@@ -287,7 +287,7 @@ function createSocket(events) {
         const res = cbor.decode(blob);
         const { method, params } = res;
 
-        console.log(res);
+        if (method !== 'pong' ) console.log(res);
 
         // check for error and split into response type and data
         if (res.err) return errHandler(res.err);
diff --git a/server/src/game.rs b/server/src/game.rs
index 14227e6c..3b3a003a 100644
--- a/server/src/game.rs
+++ b/server/src/game.rs
@@ -568,12 +568,12 @@ impl Game {
             return self;
         }
 
-        info!("upkeep beginning: {:} vs {:}", self.players[0].name, self.players[1].name);
-
         if !self.phase_timed_out() {
             return self;
         }
 
+        info!("upkeep game: {:} vs {:}", self.players[0].name, self.players[1].name);
+
         for player in self.players.iter_mut() {
             if !player.ready {
                 player.set_ready(true);