From 2cc10cdbc230f82202bdddb7a244c903c05ab351 Mon Sep 17 00:00:00 2001
From: Benjamin Auder <benjamin.auder@somewhere>
Date: Mon, 1 Jul 2019 18:21:28 +0200
Subject: [PATCH] 'update'

---
 client/src/views/Game.vue | 29 +++++++++++------------------
 client/src/views/Hall.vue |  2 +-
 server/sockets.js         |  6 ++++++
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index ea5ea365..5eeb7fd5 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -185,6 +185,12 @@ export default {
         case "abort":
           this.$refs["basegame"].endGame("?", "Abort: " + data.msg);
           break;
+        case "draw":
+          this.$refs["basegame"].endGame("1/2", "Mutual agreement");
+          break;
+        case "drawoffer":
+          this.drawOffer = "received";
+          break;
         // TODO: drawaccepted (click draw button before sending move ==> draw offer in move)
           // ==> on "newmove", check "drawOffer" field
         // TODO: also use (dis)connect info to count online players?
@@ -214,34 +220,21 @@ export default {
   },
   methods: {
     offerDraw: function() {
+      // TODO: also for corr games
       if (this.drawOffer == "received")
       {
-        if (!confirm("Offer draw?"))
+        if (!confirm("Accept draw?"))
           return;
         this.st.conn.send(JSON.stringify({code:"draw", target:this.game.oppid}));
+        this.$refs["basegame"].endGame("1/2", "Mutual agreement");
+      }
       else if (this.drawOffer == "sent")
         this.drawOffer = "";
       else
       {
         if (!confirm("Offer draw?"))
           return;
-      // Stay in "draw offer sent" state until next move is played
-      this.drawOfferSent = true;
-      if (this.subMode == "corr")
-      {
-        // TODO: set drawOffer on in game (how ?)
-      }
-      else //live game
-      {
-        this.opponents.forEach(o => {
-          if (!!o.online)
-          {
-            try {
-            } catch (INVALID_STATE_ERR) {
-              return;
-            }
-          }
-        });
+        this.st.conn.send(JSON.stringify({code:"drawoffer", target:this.game.oppid}));
       }
     },
     // + conn handling: "draw" message ==> agree for draw (if we have "drawOffered" at true)
diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 209dae30..636eabc3 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -455,7 +455,7 @@ export default {
       console.log("click challenge");
       console.log(c);
 
-      else if (c.from.sid == this.st.user.sid
+      if (c.from.sid == this.st.user.sid
         || (this.st.user.id > 0 && c.from.id == this.st.user.id))
       {
         // It's my challenge: cancel it
diff --git a/server/sockets.js b/server/sockets.js
index a3f4649a..fcda9816 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -102,6 +102,12 @@ module.exports = function(wss) {
         case "abort":
           clients[obj.target].send(JSON.stringify({code:"abort",msg:obj.msg}));
           break;
+        case "drawoffer":
+          clients[obj.target].send(JSON.stringify({code:"drawoffer"}));
+          break;
+        case "draw":
+          clients[obj.target].send(JSON.stringify({code:"draw"}));
+          break;
       }
     });
     socket.on("close", () => {
-- 
2.44.0