X-Git-Url: https://git.auder.net/images/pieces/Cwda/bt.svg?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=b2ab334f5eac5c510012e5e7447644e8e51e95ca;hb=0ee35787b643723d5b4fa023d83b4eb6630089c8;hp=19f2e77db56f22ac3e37908ff113eea514fb42ff;hpb=77fd729819118d491ff91c1d99960add2ef9cff3;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 19f2e77d..b2ab334f 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -122,25 +122,37 @@ export default {
       return playerList;
     },
   },
+  watch: {
+    // Watch event "user infos retrieved" (through /whoami)
+    "st.user.id": function(newId) {
+      if (newId > 0) //should always be the case
+      {
+      // Ask server for current corr games (all but mines)
+  //    ajax(
+  //      "/games",
+  //      "GET",
+  //      {excluded: this.st.user.id},
+  //      response => {
+  //        this.games = this.games.concat(response.games);
+  //      }
+  //    );
+      // Also ask for corr challenges (open + sent to me)
+        ajax(
+          "/challenges",
+          "GET",
+          {uid: this.st.user.id},
+          response => {
+            console.log(response.challenges);
+            // TODO: post-treatment on challenges ?
+            this.challenges = this.challenges.concat(response.challenges);
+          }
+        );
+      }
+    },
+  },
   created: function() {
     // Always add myself to players' list
     this.players.push(this.st.user);
-    // Ask server for current corr games (all but mines)
-//    ajax(
-//      "",
-//      "GET",
-//      response => {
-//
-//      }
-//    );
-    //    // Also ask for corr challenges (all) --> + accepted status if I play
-//    ajax(
-//      "",
-//      "GET",
-//      response => {
-//
-//      }
-//    );
     // 0.1] Ask server for room composition:
     const socketOpenListener = () => {
       this.st.conn.send(JSON.stringify({code:"pollclients"}));
@@ -390,8 +402,8 @@ export default {
         {
           this.players.push({name:"", id:0, sid:data.sid});
           this.st.conn.send(JSON.stringify({code:"askidentity", target:data.sid}));
-          this.st.conn.send(JSON.stringify({code:"askchallenge", target:sid}));
-          this.st.conn.send(JSON.stringify({code:"askgame", target:sid}));
+          this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.sid}));
+          this.st.conn.send(JSON.stringify({code:"askgame", target:data.sid}));
           break;
         }
         case "disconnect":
@@ -520,16 +532,15 @@ export default {
           // TODO: if special FEN, show diagram after loading variant
           c.accepted = confirm("Accept challenge?");
         }
-        const action = (c.accepted ? "accept" : "refuse");
         this.st.conn.send(JSON.stringify({
-          code: action + "challenge",
+          code: (c.accepted ? "accept" : "refuse") + "challenge",
           cid: c.id, target: c.from.sid}));
-        if (c.type == "corr")
+        if (c.type == "corr" && c.accepted)
         {
           ajax(
             "/challenges",
             "PUT",
-            {action: action, id: this.challenges[cIdx].id}
+            {action: "accept", id: this.challenges[cIdx].id}
           );
         }
         if (!c.accepted)
@@ -546,8 +557,7 @@ export default {
         }
       }
     },
-    // c.type == corr alors use id...sinon sid (figés)
-    // NOTE: only for live games ?
+    // NOTE: for live games only (corr games are launched on server)
     launchGame: async function(c) {
       // Just assign colors and pass the message
       const vname = this.getVname(c.vid);