X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChat.vue;h=25898cecf7bc16f6cc20f77054fc451c08abaf5f;hb=50bd11841587246cbedecf19097cfe5c4e5e163c;hp=7f8076761aa354425c22e22aa9a4a8ad11bb32ad;hpb=db1f1f9adb920605c7a16b060a7737e54636ee08;p=vchess.git

diff --git a/client/src/components/Chat.vue b/client/src/components/Chat.vue
index 7f807676..25898cec 100644
--- a/client/src/components/Chat.vue
+++ b/client/src/components/Chat.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 div
   button(@click="clearHistory()")
-    | {{ st.tr["Clear chat"] }}
+    | {{ st.tr["Clear history"] }}
   input#inputChat(
     type="text"
     :placeholder="st.tr['Chat here']"
@@ -9,7 +9,7 @@ div
   )
   button(@click="sendChat()") {{ st.tr["Send"] }}
   p(v-for="chat in chats.concat(pastChats)")
-    span.name {{ chat.name }} :&nbsp;
+    span.name {{ chat.name || "@nonymous" }} :&nbsp;
     span(
       :class="classObject(chat)"
       v-html="chat.msg"
@@ -21,39 +21,59 @@ import { store } from "@/store";
 export default {
   name: "my-chat",
   // Prop 'pastChats' for corr games where chats are on server
-  props: ["players", "pastChats", "newChat"],
+  props: ["players", "pastChats"],
   data: function() {
     return {
       st: store.state,
       chats: [] //chat messages after human game
     };
   },
-  watch: {
-    newChat: function(chat) {
-      if (chat.msg != "")
-        this.chats.unshift({ msg: chat.msg, name: chat.name || "@nonymous" });
-    }
-  },
   methods: {
     classObject: function(chat) {
       return {
-        "my-chatmsg": chat.name == this.st.user.name,
+        "my-chatmsg": (
+          !!chat.name && chat.name == this.st.user.name ||
+          !!chat.sid && chat.sid == this.st.user.sid
+        ),
         "opp-chatmsg":
           !!this.players &&
           this.players.some(
-            p => p.name == chat.name && p.name != this.st.user.name
+            p => {
+              return (
+                (
+                  !!p.name &&
+                  p.name == chat.name &&
+                  p.name != this.st.user.name
+                )
+                ||
+                (
+                  !!p.sid &&
+                  p.sid == chat.sid &&
+                  p.sid != this.st.user.sid
+                )
+              );
+            }
           )
       };
     },
     sendChat: function() {
       let chatInput = document.getElementById("inputChat");
       const chatTxt = chatInput.value.trim();
+      chatInput.focus(); //required on smartphones
       if (chatTxt == "") return; //nothing to send
       chatInput.value = "";
-      const chat = { msg: chatTxt, name: this.st.user.name || "@nonymous" };
+      const chat = {
+        msg: chatTxt,
+        name: this.st.user.name,
+        // SID is required only for anonymous users (in live games)
+        sid: this.st.user.id  == 0 ? this.st.user.sid : null
+      };
       this.$emit("mychat", chat);
       this.chats.unshift(chat);
     },
+    newChat: function(chat) {
+      if (chat.msg != "") this.chats.unshift(chat);
+    },
     clearHistory: function() {
       this.chats = [];
       this.$emit("chatcleared");