X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=cadda013897fdd3000cd7623f91d2217d4a9f4d0;hb=cd0d7743323309fcfd241ccba959df81a77970c7;hp=1cb9af5883864476620659da0676d2545067d15c;hpb=afd3240d89a2f6191fe9426960dc0c1667b40c77;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 1cb9af58..cadda013 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -18,19 +18,17 @@
       button(@click="() => abortGame()") Abort
       button(@click="resign") Resign
     textarea(v-if="game.score=='*'" v-model="corrMsg")
+    Chat(:players="game.players")
 </template>
 
 <!--
-// TODO: movelist dans basegame et chat ici
 // ==> après, implémenter/vérifier les passages de challenges + parties en cours
 // observer,
-// when send to chat (or a move), reach only this group (send gid along)
 -->
 
 <script>
 import BaseGame from "@/components/BaseGame.vue";
-//import Chat from "@/components/Chat.vue";
-//import MoveList from "@/components/MoveList.vue";
+import Chat from "@/components/Chat.vue";
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
 import { ppt } from "@/utils/datetime";
@@ -41,6 +39,7 @@ export default {
   name: 'my-game',
   components: {
     BaseGame,
+    Chat,
   },
   // gameRef: to find the game in (potentially remote) storage
   data: function() {
@@ -163,6 +162,10 @@ export default {
         case "identity":
         {
           let player = this.people.find(p => p.sid == data.user.sid);
+          // NOTE: sometimes player.id fails because player is undefined...
+          // Probably because the event was meant for Hall?
+          if (!player)
+            return;
           player.id = data.user.id;
           player.name = data.user.name;
           // Sending last state only for live games: corr games are complete
@@ -185,6 +188,19 @@ export default {
           }
           break;
         }
+        case "askgame":
+          // Send current (live) game
+          const myGame =
+          {
+            // Minimal game informations:
+            id: this.game.id,
+            players: this.game.players.map(p => p.name),
+            vid: this.game.vid,
+            timeControl: this.game.timeControl,
+          };
+          this.st.conn.send(JSON.stringify({code:"game",
+            game:myGame, target:data.from}));
+          break;
         case "newmove":
           // NOTE: this call to play() will trigger processMove()
           this.$refs["basegame"].play(data.move,
@@ -236,12 +252,12 @@ export default {
         // ==> on "newmove", check "drawOffer" field
         case "connect":
         {
-          this.people.push({name:"", id:0, sid:data.sid});
-          this.st.conn.send(JSON.stringify({code:"askidentity", target:data.sid}));
+          this.people.push({name:"", id:0, sid:data.from});
+          this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
           break;
         }
         case "disconnect":
-          ArrayFun.remove(this.people, p => p.sid == data.sid);
+          ArrayFun.remove(this.people, p => p.sid == data.from);
           break;
       }
     },