finish integration of upstream pressage

axolotl-chat · Feb 13, 2023 · ce106a4 · ce106a4
1 parent 7fbac2a
commit ce106a4
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 64 deletions.
diff --git a/axolotl-web/src/components/LegacyHeader.vue b/axolotl-web/src/components/LegacyHeader.vue
@@ -29,7 +29,7 @@
                   <div class="col-12">
                     <div
                       v-if="
-                        isGroup &&
+                        currentChat.isGroup &&
                           currentChat.title === currentChat.Tel
                       "
                       class="header-text-chat"
@@ -54,7 +54,7 @@
                   <div class="col-12">
                     <div
                       v-if="
-                        isGroup &&
+                        currentChat.isGroup &&
                           currentGroup !== null &&
                           typeof currentGroup !== 'undefined'
                       "
@@ -66,7 +66,7 @@
                     </div>
                     <div
                       v-if="
-                        isGroup &&
+                        currentChat.isGroup &&
                           currentGroup !== null &&
                           typeof currentGroup !== 'undefined'
                       "
@@ -78,7 +78,7 @@
                     </div>
                     <div
                       v-if="
-                        !isGroup &&
+                        !currentChat.isGroup &&
                           currentChat.title === currentChat.Tel
                       "
                       class="number-text"
@@ -112,7 +112,7 @@
                 <button
                   v-if="
                     currentChat !== null &&
-                      !isGroup &&
+                      !currentChat.isGroup &&
                       currentChat.title !== currentChat.Tel
                   "
                   class="dropdown-item"
@@ -139,7 +139,7 @@
                 <button
                   v-if="
                     currentChat !== null &&
-                      !isGroup &&
+                      !currentChat.isGroup &&
                       currentChat.title === currentChat.Tel
                   "
                   v-translate
@@ -151,7 +151,7 @@
                 <button
                   v-if="
                     currentChat !== null &&
-                      !isGroup &&
+                      !currentChat.isGroup &&
                       currentChat.title !== currentChat.Tel
                   "
                   v-translate
@@ -395,7 +395,6 @@ export default {
       addContactModal: false,
       editContactModal: false,
       editContactId: -1,
-      isGroup: false,
     };
   },
   computed: mapState([
@@ -418,7 +417,6 @@ export default {
       handler() {
         this.names = [];
         this.showSettingsMenu = false;
-        this.isGroup = this.isGroupCheck(this.currentChat)
       },
       deep: true,
     },

diff --git a/axolotl-web/src/components/Message.vue b/axolotl-web/src/components/Message.vue
@@ -59,7 +59,7 @@
       </div>
       <blockquote v-if="message.QuotedMessage">
         <cite v-if="message.QuotedMessage && is_outgoing" v-translate>You</cite>
-        <cite v-else>{{ getName(message.QuotedMessage.SourceUUID) }}</cite>
+        <cite v-else>{{ name?name:getName(message.QuotedMessage.SourceUUID) }}</cite>
         <p>{{ message.QuotedMessage.Message }}</p>
       </blockquote>
       <div v-if="message.Attachment !== ''" class="attachment">
@@ -210,10 +210,8 @@ export default {
       if (this.senderName == "") {
         const uuid = this.message.sender
         const contact = this.contacts.find(function (element) {
-          console.log(element.address.uuid, uuid);
           return element.address.uuid === uuid;
         });
-        console.log(contact);
         if (typeof contact !== "undefined") {
           return contact.name;
         }
@@ -246,7 +244,6 @@ export default {
         };
       }
     }
-    this.getName(this.message.SourceUUID);
   },
   methods: {
     sanitize(msg) {
@@ -273,12 +270,12 @@ export default {
       }
     },
     getName() {
+      if(!this.isGroup) return "";
       if (this.contacts !== null) {
         const uuid = this.message.sender;
         const contact = this.contacts.find(function (element) {
           return element.address.uuid === uuid;
         });
-        console.log(contact);
         if (typeof contact !== "undefined") {
           this.name = contact.name;
           return this.name;
@@ -295,8 +292,8 @@ export default {
           return this.name;
         }
       }
-      this.name = uuid;
-      return uuid;
+      this.name = this.message.sender;
+      return this.message.sender;
     },
     isAttachmentArray(input) {
       try {

diff --git a/axolotl-web/src/pages/ChatList.vue b/axolotl-web/src/pages/ChatList.vue
@@ -20,18 +20,18 @@
           <font-awesome-icon icon="times" />
         </button>
       </div>
-      <div v-for="chat in chatList" :key="chat.id" class="row">
+      <div v-for="chat in chatList" :key="chat.id.Contact?chat.id.Contact:chat.id.Group" class="row">
         <!-- chat entry -->
         <div
-          :id="chat.id"
+          :id="chat.id.Contact?chat.id.Contact:chat.id.Group"
           :class="
-            editActive && selectedChat.indexOf(chat.id) >= 0
+            editActive && selectedChat.indexOf(chat.id.Contact?chat.id.Contact:chat.id.Group) >= 0
               ? 'selected col-12 chat-container'
               : 'col-12 chat-container '
           "
           data-long-press-delay="500"
           @click="enterChat(chat)"
-          @long-press="editChat(chat.id)"
+          @long-press="editChat(chat.id.Contact?chat.id.Contact:chat.id.Group)"
         >
           <div class="row chat-entry">
             <div class="avatar col-2">
@@ -134,7 +134,6 @@ export default {
   },
   created() {},
   mounted() {
-    this.$store.dispatch("getChatList");
     document.body.scrollTop = 0;
     document.documentElement.scrollTop = 0;
     this.$language.current = navigator.language || navigator.userLanguage;
@@ -195,7 +194,7 @@ export default {
     enterChat(chat) {
       if (!this.editActive) {
         this.$store.dispatch("setCurrentChat", chat);
-        router.push("/chat/" + chat.id);
+        router.push(`/chat/${JSON.stringify(chat.id)}`);
       } else {
         this.selectedChat.push(chat.Tel);
       }

diff --git a/axolotl-web/src/router/router.js b/axolotl-web/src/router/router.js
@@ -214,7 +214,6 @@ router.beforeEach((to, from, next) => {
 function proceed(to, next) {
   const registrationPages = ['/register', '/verify', '/password', '/pin', '/setUsername', '/qr', '/onboarding'];
   const registrationStatus = store.state.registrationStatus;
-  console.log(registrationStatus)
   //disable routes when registration is not finished yet
   if (registrationStatus === null && !registrationPages.includes(to.path)) {
     return next('/onboarding');

diff --git a/axolotl-web/src/store/store.js b/axolotl-web/src/store/store.js
@@ -293,7 +293,7 @@ export default createStore({
             request: message,
             code: 200,
           }));
-        this.dispatch("getChatList")
+        // this.dispatch("getChatList")
       }, state.socket.heartBeatInterval);
     },
     SOCKET_ONCLOSE(state) {
@@ -426,8 +426,10 @@ export default createStore({
             const messageSent = JSON.parse(messageData.data);
             console.log("message_sent", messageSent);
             this.commit("SET_MESSAGE_RECEIVED", messageSent.message);
+          } else if (messageData.response_type === "registration_done") {
+            this.commit("SET_REGISTRATION_STATUS", "registered");
+            router.push("/")
           }
-
           break;
         default:
           console.log("unkown message ", messageData, Object.keys(messageData)[0]);
@@ -498,8 +500,6 @@ export default createStore({
       }
     },
     getMessageList(state, chatId) {
-      console.log("getMessageList2", chatId)
-
       this.commit("CLEAR_MESSAGELIST");
       if (this.state.socket.isConnected) {
         const data = {