Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop

client/src/components/shapes.jsx

@@ -36,26 +36,26 @@ module.exports = {
     // Speed,
 
     // Lifes Upgrades
-    LifeGGI: () => square(['green']),
-    LifeRRI: () => square(['red']),
-    LifeBBI: () => square(['blue']),
-    LifeRGI: () => square(['red', 'green']),
-    LifeGBI: () => square(['green', 'blue']),
-    LifeRBI: () => square(['red', 'blue']),
+    LifeGG: () => square(['green']),
+    LifeRR: () => square(['red']),
+    LifeBB: () => square(['blue']),
+    LifeRG: () => square(['red', 'green']),
+    LifeGB: () => square(['green', 'blue']),
+    LifeRB: () => square(['red', 'blue']),
 
     // Power Upgrades
-    PowerGGI: () => circle(['green']),
-    PowerRRI: () => circle(['red']),
-    PowerBBI: () => circle(['blue']),
-    PowerRGI: () => circle(['red', 'green']),
-    PowerGBI: () => circle(['green', 'blue']),
-    PowerRBI: () => circle(['red', 'blue']),
+    PowerGG: () => circle(['green']),
+    PowerRR: () => circle(['red']),
+    PowerBB: () => circle(['blue']),
+    PowerRG: () => circle(['red', 'green']),
+    PowerGB: () => circle(['green', 'blue']),
+    PowerRB: () => circle(['red', 'blue']),
 
     // Speed Upgrades
-    SpeedGGI: () => triangle(['green']),
-    SpeedRRI: () => triangle(['red']),
-    SpeedBBI: () => triangle(['blue']),
-    SpeedRGI: () => triangle(['red', 'green']),
-    SpeedGBI: () => triangle(['green', 'blue']),
-    SpeedRBI: () => triangle(['red', 'blue']),
+    SpeedGG: () => triangle(['green']),
+    SpeedRR: () => triangle(['red']),
+    SpeedBB: () => triangle(['blue']),
+    SpeedRG: () => triangle(['red', 'green']),
+    SpeedGB: () => triangle(['green', 'blue']),
+    SpeedRB: () => triangle(['red', 'blue']),
 };

server/src/pubsub.rs

@@ -53,11 +53,12 @@ fn handle_notification(n: Notification, db: &Db, pss: &Sender<Message>) -> Resul
 
     let msg = match n.action {
         Action::Delete => return Err(format_err!("unimplemented delete notification {:?}", n)),
-        _ => match n.table {
+        Action::Insert => return Err(format_err!("unimplemented insert notification {:?}", n)),
+        Action::Update => match n.table {
             Table::Accounts => Message::Account(account::select(db, n.id)?),
             Table::Instances => Message::Instance(instance::instance_get(&mut tx, n.id)?),
             Table::Games => Message::Game(game::game_get(&mut tx, n.id)?),
-            _ => return Err(format_err!("unimplemented notification {:?}", n)),
+            _ => return Err(format_err!("unimplemented update notification {:?}", n)),
         },
     };