From 43a53e5651b896458823c2a2ed3942c34ae4cacf Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 10 Oct 2019 15:00:45 +1100
Subject: [PATCH] various pax things

---
 client/assets/styles/styles.mobile.less      | 4 ++++
 client/src/components/instance.ctrl.btns.jsx | 9 +++++++++
 client/src/components/play.jsx               | 2 +-
 server/src/instance.rs                       | 6 +++---
 server/src/names.rs                          | 8 ++++++--
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/client/assets/styles/styles.mobile.less b/client/assets/styles/styles.mobile.less
index e8269bd2..be259075 100644
--- a/client/assets/styles/styles.mobile.less
+++ b/client/assets/styles/styles.mobile.less
@@ -123,4 +123,8 @@
             padding: 0;
         }
     }
+
+    .play-p {
+        display: none;
+    }
 }
diff --git a/client/src/components/instance.ctrl.btns.jsx b/client/src/components/instance.ctrl.btns.jsx
index d2acd10c..f1ca2be5 100644
--- a/client/src/components/instance.ctrl.btns.jsx
+++ b/client/src/components/instance.ctrl.btns.jsx
@@ -38,6 +38,15 @@ function InstanceCtrlBtns(args) {
 
     const finished = instance && instance.phase === 'Finished';
 
+    // cheeky to make sure nubs don't just abandon their first game
+    const beingNub = instance.phase_end
+        && instance.phase === 'Lobby'
+        && Date.parse(instance.phase_end) - Date.now() < 2000;
+
+    if (beingNub) {
+        sendReady();
+    }
+
     return (
         <div class="instance-ctrl-btns">
             <button disabled={true} >Chat</button>
diff --git a/client/src/components/play.jsx b/client/src/components/play.jsx
index 3e8fb916..3e0a7f5f 100644
--- a/client/src/components/play.jsx
+++ b/client/src/components/play.jsx
@@ -94,7 +94,7 @@ function Play(args) {
         <section class="top">
             <div class="news">
                 <h1>v{VERSION}</h1>
-                <p>Use the buttons on the right to join an instance.</p>
+                <p class="play-p">Use the buttons on the right to join an instance.</p>
                 <p>
                     Select <b>PVP</b> to play against other players.<br />
                     Select <b>INVITE</b> then click <b>COPY LINK</b> to generate an instance invitation for a friend.<br />
diff --git a/server/src/instance.rs b/server/src/instance.rs
index 9cc55221..9731f879 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -530,13 +530,13 @@ pub fn instance_create(tx: &mut Transaction, instance: Instance) -> Result<Insta
     let instance_bytes = to_vec(&instance)?;
 
     let query = "
-        INSERT INTO instances (id, data)
-        VALUES ($1, $2)
+        INSERT INTO instances (id, data, upkeep)
+        VALUES ($1, $2, $3)
         RETURNING id;
     ";
 
     let result = tx
-        .query(query, &[&instance.id, &instance_bytes])?;
+        .query(query, &[&instance.id, &instance_bytes, &instance.phase_end])?;
 
     result.iter().next().ok_or(format_err!("no instances written"))?;
 
diff --git a/server/src/names.rs b/server/src/names.rs
index 48d81c7c..ad8d738e 100644
--- a/server/src/names.rs
+++ b/server/src/names.rs
@@ -1,7 +1,7 @@
 use rand::prelude::*;
 use rand::{thread_rng};
 
-const FIRSTS: [&'static str; 51] = [
+const FIRSTS: [&'static str; 52] = [
     "artificial",
     "ambient",
     "borean",
@@ -46,6 +46,7 @@ const FIRSTS: [&'static str; 51] = [
     "purified",
     "recalcitrant",
     "rogue",
+    "sealed",
     "subversive",
     "subterranean",
     "supercooled",
@@ -55,10 +56,12 @@ const FIRSTS: [&'static str; 51] = [
     "weary",
 ];
 
-const LASTS: [&'static str; 56] = [
+const LASTS: [&'static str; 58] = [
     "artifact",
     "assembly",
+    "antenna",
     "alloy",
+    "carrier",
     "carbon",
     "console",
     "construct",
@@ -88,6 +91,7 @@ const LASTS: [&'static str; 56] = [
     "mechanism",
     "mountain",
     "nectar",
+    "nebula",
     "oak",
     "oxide",
     "orbit",