X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=5148c3cfd00ab5f21445fecec10d1b673c74cb83;hb=3ecfb65d520b9d64a59e46a3a2c286b031ee1c26;hp=e84393175520ca444d475053cfb64124106e821a;hpb=dc821737247aee1a0d93a232a292eeda940d06bc;p=vchess.git

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index e8439317..5148c3cf 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -11,11 +11,13 @@ main
         v-show="display=='live'"
         :games="liveGames"
         @show-game="showGame"
+        @abortgame="abortGame"
       )
       GameList(
         v-show="display=='corr'"
         :games="corrGames"
         @show-game="showGame"
+        @abortgame="abortGame"
       )
 </template>
 
@@ -23,6 +25,7 @@ main
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
 import { ajax } from "@/utils/ajax";
+import { getScoreMessage } from "@/utils/scoring";
 import params from "@/parameters";
 import { getRandString } from "@/utils/alea";
 import GameList from "@/components/GameList.vue";
@@ -43,14 +46,28 @@ export default {
   },
   created: function() {
     GameStorage.getAll(true, localGames => {
-      localGames.forEach(g => (g.type = this.classifyObject(g)));
+      localGames.forEach(g => g.type = "live");
       this.liveGames = localGames;
     });
     if (this.st.user.id > 0) {
-      ajax("/games", "GET", { uid: this.st.user.id }, res => {
-        res.games.forEach(g => (g.type = this.classifyObject(g)));
-        this.corrGames = res.games;
-      });
+      ajax(
+        "/games",
+        "GET",
+        {
+          data: { uid: this.st.user.id },
+          success: (res) => {
+            let serverGames = res.games.filter(g => {
+              const mySide =
+                g.players[0].uid == this.st.user.id
+                  ? "White"
+                  : "Black";
+              return !g["deletedBy" + mySide];
+            });
+            serverGames.forEach(g => g.type = "corr");
+            this.corrGames = serverGames;
+          }
+        }
+      );
     }
     // Initialize connection
     this.connexionString =
@@ -102,8 +119,10 @@ export default {
           (rem == 1 && myColor == "b")
         );
       };
-      if (game.type == "live" || !isMyTurn(game))
+      if (game.type == "live" || !isMyTurn(game)) {
         this.$router.push("/game/" + game.id);
+        return;
+      }
       // It's my turn in this game. Are there others?
       let nextIds = "";
       let otherCorrGamesMyTurn = this.corrGames.filter(
@@ -116,6 +135,42 @@ export default {
       }
       this.$router.push("/game/" + game.id + nextIds);
     },
+    abortGame: function(game) {
+      // Special "trans-pages" case: from MyGames to Game
+      // TODO: also for corr games? (It's less important)
+      if (game.type == "live") {
+        const oppsid =
+          game.players[0].sid == this.st.user.sid
+            ? game.players[1].sid
+            : game.players[0].sid;
+        this.conn.send(
+          JSON.stringify(
+            {
+              code: "mabort",
+              gid: game.id,
+              // NOTE: target might not be online
+              target: oppsid
+            }
+          )
+        );
+      }
+      else if (!game.deletedByWhite || !game.deletedByBlack) {
+        // Set score if game isn't deleted on server:
+        ajax(
+          "/games",
+          "PUT",
+          {
+            data: {
+              gid: game.id,
+              newObj: {
+                score: "?",
+                scoreMsg: getScoreMessage("?")
+              }
+            }
+          }
+        );
+      }
+    },
     socketMessageListener: function(msg) {
       const data = JSON.parse(msg.data);
       if (data.code == "changeturn") {