From 09da927defb1d76f58131753d8ae28ec8c7a9db3 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 14 May 2020 01:53:26 +0300
Subject: [PATCH] WIP chat refactoring

---
 src/components/chat/chat.js | 25 +++++++++----------------
 src/modules/chats.js        |  3 ++-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index beee9790..16ec4fd9 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -24,7 +24,6 @@ const Chat = {
       mobileLayout: this.$store.state.interface.mobileLayout,
       recipientId: this.$route.params.recipient_id,
       hoveredSequenceId: undefined,
-      chatViewItems: chatService.getView(this.currentChatMessageService),
       newMessageCount: this.currentChatMessageService && this.currentChatMessageService.newMessageCount
     }
   },
@@ -74,16 +73,15 @@ const Chat = {
         return this.$t('chats.write_message')
       }
     },
-    customRef () {
-      return this.$store.state.chats.ref
+    chatViewItems () {
+      return chatService.getView(this.currentChatMessageService)
     },
-    ...mapGetters(['currentChat', 'currentChatMessageService', 'findUser']),
+    ...mapGetters(['currentChat', 'currentChatMessageService', 'findUser', 'findOpenedChatByRecipientId']),
     ...mapState({
       backendInteractor: state => state.api.backendInteractor,
       currentUser: state => state.users.currentUser,
       isMobileLayout: state => state.interface.mobileLayout,
-      openedChats: state => state.chats.openedChats,
-      openedChatMessageServices: state => state.chats.openedChatMessageServices
+      openedChats: state => state.chats.openedChats
     })
   },
   watch: {
@@ -96,11 +94,6 @@ const Chat = {
         }
       })
     },
-    'currentChatMessageService.messages.length': {
-      handler: function () {
-        this.chatViewItems = chatService.getView(this.currentChatMessageService)
-      }
-    },
     '$route': function (prev, next) {
       this.recipientId = this.$route.params.recipient_id
       this.startFetching()
@@ -112,9 +105,10 @@ const Chat = {
     },
     onPosted (data) {
       this.$store.dispatch('addChatMessages', { chatId: this.currentChat.id, messages: [data] }).then(() => {
-        this.chatViewItems = chatService.getView(this.currentChatMessageService)
-        this.updateSize()
-        this.scrollDown({ forceRead: true })
+        this.$nextTick(() => {
+          this.updateSize()
+          this.scrollDown({ forceRead: true })
+        })
       })
     },
     onFilesDropped () {
@@ -315,7 +309,6 @@ const Chat = {
     },
     fetchChat (isFirstFetch, chatId, opts = {}) {
       let maxId = opts.maxId
-      this.chatViewItems = chatService.getView(this.currentChatMessageService)
       if (isFirstFetch) {
         this.scrollDown({ forceRead: true })
       }
@@ -362,7 +355,7 @@ const Chat = {
       this.newMessageCount = this.currentChatMessageService.newMessageCount
     },
     async startFetching () {
-      let chat = _.find(this.openedChats, c => c.account.id === this.recipientId)
+      let chat = this.findOpenedChatByRecipientId(this.recipientId)
       if (!chat) {
         chat = await this.backendInteractor.getOrCreateChat({ accountId: this.recipientId })
       }
diff --git a/src/modules/chats.js b/src/modules/chats.js
index 29fc2c55..5c5007ff 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -22,7 +22,8 @@ const chats = {
   state: { ...defaultState },
   getters: {
     currentChat: state => state.openedChats[state.currentChatId],
-    currentChatMessageService: state => state.openedChatMessageServices[state.currentChatId]
+    currentChatMessageService: state => state.openedChatMessageServices[state.currentChatId],
+    findOpenedChatByRecipientId: state => recipientId => find(state.openedChats, c => c.account.id === recipientId)
   },
   actions: {
     // Chat list