fix show first sent message

axolotl-chat · Sep 30, 2019 · a263184 · a263184
1 parent 58665ae
commit a263184
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/app/webserver/webserver.go b/app/webserver/webserver.go
@@ -176,8 +176,9 @@ func wsReader(conn *websocket.Conn) {
 			createChatMessage := CreateChatMessage{}
 			json.Unmarshal([]byte(p), &createChatMessage)
 			log.Println("Create chat for ", createChatMessage.Tel)
-			sess := createChat(createChatMessage.Tel)
-			sendMessageList(conn, sess.Tel)
+			createChat(createChatMessage.Tel)
+			activeChat = createChatMessage.Tel
+			store.ActiveSessionID = activeChat
 		} else if incomingMessage.Type == "leaveChat" {
 			activeChat = ""
 			store.ActiveSessionID = ""
@@ -415,6 +416,7 @@ func sendMessageList(client *websocket.Conn, id string) {
 		fmt.Println(err)
 		return
 	}
+	log.Debugln(messageList)
 	messageList.Session.MarkRead()
 	chatListEnvelope := &MessageListEnvelope{
 		MessageList: messageList,

diff --git a/axolotl-web/src/pages/DeviceList.vue b/axolotl-web/src/pages/DeviceList.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="deviceList">
     <div v-if="devices.length>1" class="row">
-      <div v-for="device in devices" v-if="device.id!=1" v-bind:key="device.id" 
+      <div v-for="device in devices" v-if="device.id!=1" v-bind:key="device.id"
         class="col-12 device row">
         <div class="col-10">
           {{device.name}} <br/>

diff --git a/axolotl-web/src/pages/MessageList.vue b/axolotl-web/src/pages/MessageList.vue
@@ -87,6 +87,8 @@ export default {
       if(this.messageInput!=""){
         this.$store.dispatch("sendMessage", {to:this.chatId, message:this.messageInput});
         this.messageInput=""
+        if(this.$store.state.messageList.Messages==null)
+        this.$store.dispatch("getMessageList", this.getId());
         document.getElementById("messageInput").style.height="auto";
       }
 

diff --git a/axolotl-web/src/store/store.js b/axolotl-web/src/store/store.js
@@ -108,8 +108,8 @@ export default new Vuex.Store({
         SOCKET_ONCLOSE (state)  {
           state.socket.isConnected = false
         },
-        SOCKET_ONERROR (state, event)  {
-          console.error(state, event)
+        SOCKET_ONERROR ()  {
+          // console.error(state, event)
         },
         // default handler called for all methods
         SOCKET_ONMESSAGE (state, message)  {
@@ -146,14 +146,12 @@ export default new Vuex.Store({
 
         },
         // mutations for reconnect methods
-        SOCKET_RECONNECT(state, count) {
-          console.info(state, count)
+        SOCKET_RECONNECT() {
         },
         SOCKET_RECONNECT_ERROR(state) {
           state.socket.reconnectError = true;
         },
         SET_CONFIG_GUI(state) {
-          console.log("set gui as ut");
           state.gui = "ut";
         }
   },
@@ -165,7 +163,6 @@ export default new Vuex.Store({
           "request":"addDevice",
           "url":url,
         }
-        console.log("add device",url);
         Vue.prototype.$socket.send(JSON.stringify(message))
       }
     },
@@ -237,7 +234,6 @@ export default new Vuex.Store({
       this.commit("LEAVE_CHAT");
     },
     createChat:function(context, tel){
-      console.log("create chat ", tel);
       if(this.state.socket.isConnected){
         var message = {
           "request":"createChat",