Rewrite MessageList store logic and refactor chat store

bin/log-conventions.js

@@ -2,7 +2,7 @@ require('colors')
 
 function formattedOutput (location, lines) {
   console.log(
-    `${'Console log function'.red} in ${location.white}
+    `${'Console log function'.red} in ${location.yellow}
 
 ${lines}
 

scss/message/_message.scss

@@ -142,10 +142,10 @@
     }
 
     .module-message__img-attachment {
-        object-fit: unset;
+        object-fit: cover;
         width: auto;
         max-width: 100%;
-        height: auto;
+        height: 400px;
         min-height: unset;
     }
 
@@ -155,7 +155,6 @@
         margin-bottom: 3px;
         opacity: 0.86;
     }
-
 }
 
 // States that modify the message buble appearance
@@ -536,4 +535,4 @@
     line-height: 16px;
     letter-spacing: 0.3px;
     margin-top: 3px;
-}
+}

scss/overwrites/_bp3-overwrites.scss

@@ -65,6 +65,7 @@ $bp3-dialog-radius: 2px;
   width: calc(100% + 40px);
   left: -20px;
   padding: 10px 20px;
+  border-radius: 0px;
 }
 
 .bp3-heading {

src/main/deltachat/chatlist.js

@@ -17,13 +17,13 @@ module.exports = class DCChatList extends SplitOut {
       if (chat.freshMessageCounter > 0) {
         this._dc.markNoticedChat(chat.id)
         chat.freshMessageCounter = 0
-        const messagIds = chat.messages.map((msg) => msg.id)
+        const messagIds = this.getMessageIds(chatId)
         log.debug('markSeenMessages', messagIds)
         this._dc.markSeenMessages(messagIds)
         app.setBadgeCount(this._getGeneralFreshMessageCounter())
       }
     }
-    this._controller.sendToRenderer('DD_EVENT_CHAT_SELECTED', { chat })
+    return chat
   }
 
   onChatModified (chatId) {
@@ -120,10 +120,6 @@ module.exports = class DCChatList extends SplitOut {
     if (chat === null) return null
     this._controller._pages = 0
 
-    // console.log('getFullChatById', chatId)
-    const messageIds = this._dc.getChatMessages(chat.id, C.DC_GCM_ADDDAYMARKER, 0)
-    const messages = loadMessages ? this._controller.messageList._messagesToRender(messageIds) : []
-
     const isGroup = isGroupChat(chat)
     const contactIds = this._dc.getChatContacts(chatId)
 
@@ -143,8 +139,7 @@ module.exports = class DCChatList extends SplitOut {
       isSelfTalk: chat.isSelfTalk,
 
       contacts: contacts,
-      totalMessages: messageIds.length,
-      messages: messages,
+      contactIds,
       color: integerToHexColor(chat.color),
       summary: undefined,
       freshMessageCounter: this._dc.getFreshMessageCount(chatId),

src/main/deltachat/contacts.js

@@ -17,18 +17,17 @@ module.exports = class DCContacts extends SplitOut {
     log.debug(`Blocked contact ${name} (id = ${contactId})`)
   }
 
-  acceptContactRequest (deadDrop) {
-    log.info(`chat with dead drop ${deadDrop}`)
-    const contact = this._dc.getContact(deadDrop.contact.id)
+  acceptContactRequest ({ messageId, contactId }) {
+    log.info(`chat with dead drop ${contactId}:${messageId}`)
+    const contact = this._dc.getContact(contactId)
     const address = contact.getAddress()
     const name = contact.getName() || address.split('@')[0]
     this._dc.createContact(name, address)
     log.info(`Added contact ${name} (${address})`)
-    const chatId = this._dc.createChatByMessageId(deadDrop.id)
-    if (chatId) {
-      this._controller.chatList.updateChatList()
-      this._controller.chatList.selectChat(chatId)
-    }
+    const chatId = this._dc.createChatByMessageId(messageId)
+
+    if (chatId) this._controller.chatList.updateChatList()
+    return chatId
   }
 
   createContact (name, email) {

src/main/deltachat/controller.js

@@ -174,7 +174,7 @@ class DeltaChatController extends EventEmitter {
    * @param {object} payload
    */
   sendToRenderer (eventType, payload) {
-    log.debug('sendToRenderer: ' + eventType)
+    log.debug('sendToRenderer: ' + eventType, payload)
     windows.main.send('ALL', eventType, payload)
     if (!eventType) {
       log.error('Tried to send an undefined event to the renderer.\n' +
@@ -199,23 +199,21 @@ class DeltaChatController extends EventEmitter {
       }
       this.logCoreEvent(event, ...args)
       if (!event || event === 'DC_EVENT_INFO') return
-      this.sendToRenderer(event, ...args)
+      this.sendToRenderer(event, args)
     })
 
     dc.on('DD_EVENT_CHATLIST_UPDATED', this.onChatListChanged.bind(this))
 
     dc.on('DC_EVENT_MSGS_CHANGED', (chatId, msgId) => {
       this.onChatListChanged()
       this.onChatListItemChanged(chatId)
-      this.onMessageUpdate(chatId, msgId, 'DC_EVENT_MSGS_CHANGED')
       this.chatList.onChatModified(chatId)
     })
 
     dc.on('DC_EVENT_INCOMING_MSG', (chatId, msgId) => {
       maybeMarkSeen(chatId, msgId)
       this.onChatListChanged()
       this.onChatListItemChanged(chatId)
-      this.onMessageUpdate(chatId, msgId, 'DC_EVENT_INCOMING_MSG')
       this.chatList.onChatModified(chatId)
     })
 
@@ -231,12 +229,10 @@ class DeltaChatController extends EventEmitter {
 
     dc.on('DC_EVENT_MSG_DELIVERED', (chatId, msgId) => {
       this.onChatListItemChanged(chatId)
-      this.onMessageUpdate(chatId, msgId, 'DC_EVENT_MSG_DELIVERED')
     })
 
     dc.on('DC_EVENT_MSG_READ', (chatId, msgId) => {
       this.onChatListItemChanged(chatId)
-      this.onMessageUpdate(chatId, msgId, 'DC_EVENT_MSG_READ')
     })
 
     dc.on('DC_EVENT_WARNING', (warning) => {
@@ -284,17 +280,6 @@ class DeltaChatController extends EventEmitter {
     this.sendToRenderer('DD_EVENT_CHATLIST_ITEM_CHANGED', { chatId })
   }
 
-  /**
-   *
-   * @param {int} chatId
-   * @param {int} msgId
-   * @param {string} eventType
-   */
-  onMessageUpdate (chatId, msgId, eventType) {
-    if (chatId === 0 || msgId === 0) return
-    this.sendToRenderer('DD_EVENT_MSG_UPDATE', { chatId, messageObj: this.messageList.messageIdToJson(msgId), eventType })
-  }
-
   updateBlockedContacts () {
     const blockedContacts = this._blockedContacts()
     this.sendToRenderer('DD_EVENT_BLOCKED_CONTACTS_UPDATED', { blockedContacts })
@@ -333,10 +318,6 @@ class DeltaChatController extends EventEmitter {
     this.sendToRenderer('DD_EVENT_CONTACTS_UPDATED', { contacts })
   }
 
-  contactRequests () {
-    this.chatList.selectChat(C.DC_CHAT_ID_DEADDROP)
-  }
-
   setProfilePicture (newImage) {
     this._dc.setConfig('selfavatar', newImage)
   }

src/main/deltachat/messagelist.js

@@ -1,7 +1,8 @@
 const C = require('deltachat-node/constants')
 const log = require('../../logger').getLogger('main/deltachat/messagelist')
 const { integerToHexColor } = require('./util')
-const CHATVIEW_PAGE_SIZE = 20
+const filesizeConverter = require('filesize')
+const mime = require('mime-types')
 
 const SplitOut = require('./splitout')
 module.exports = class DCMessageList extends SplitOut {
@@ -11,7 +12,8 @@ module.exports = class DCMessageList extends SplitOut {
     if (filename) msg.setFile(filename)
     if (text) msg.setText(text)
     if (location) msg.setLocation(location.lat, location.lng)
-    this._dc.sendMessage(chatId, msg)
+    const messageId = this._dc.sendMessage(chatId, msg)
+    return [messageId, this.getMessage(messageId)]
   }
 
   sendSticker (chatId, stickerPath) {
@@ -41,47 +43,16 @@ module.exports = class DCMessageList extends SplitOut {
     this._dc.setDraft(chatId, msg)
   }
 
-  _messagesToRender (messageIds) {
-    // we need one more message than we render, to get the timestamp
-    // from preceeding message for DAYMARKER
-    const currentIndex = (this._controller._pages * CHATVIEW_PAGE_SIZE)
-    messageIds.reverse() // newest IDs first
-    const messageIdsToRender = messageIds.splice(
-      currentIndex,
-      CHATVIEW_PAGE_SIZE + 1
-    )
-    if (messageIdsToRender.length === 0) return []
-    messageIdsToRender.reverse() // newest IDs last
-    const messages = []
-    for (let i = 0; i < messageIdsToRender.length; i++) {
-      const id = messageIdsToRender[i]
-      if (id > C.DC_MSG_ID_LAST_SPECIAL) {
-        messages.push(this.messageIdToJson(id))
-      } else if (id === C.DC_MSG_ID_DAYMARKER && messages.length > 0) {
-        const timestamp = messages[messages.length - 1].msg.timestamp
-        const json = {
-          id,
-          msg: {
-            text: '',
-            timestamp
-          },
-          daymarker: {
-            timestamp,
-            id: 'd' + i
-          }
-        }
-        messages.push(json)
-      }
-    }
-    return messages
-  }
-
   messageIdToJson (id) {
     const msg = this._dc.getMessage(id)
     if (!msg) {
       log.warn('No message found for ID ' + id)
       return { msg: null }
     }
+    return this.messageToJson(msg)
+  }
+
+  messageToJson (msg) {
     const filemime = msg.getFilemime()
     const filename = msg.getFilename()
     const filesize = msg.getFilebytes()
@@ -93,8 +64,8 @@ module.exports = class DCMessageList extends SplitOut {
     if (contact.color) {
       contact.color = integerToHexColor(contact.color)
     }
-    return {
-      id,
+    return convert({
+      id: msg.id,
       msg: msg.toJson(),
       filemime,
       filename,
@@ -105,25 +76,88 @@ module.exports = class DCMessageList extends SplitOut {
       contact,
       isInfo: msg.isInfo(),
       setupCodeBegin
-    }
-  }
-
-  fetchMessages (chatId) {
-    var messageIds = this._dc.getChatMessages(chatId, C.DC_GCM_ADDDAYMARKER, 0)
-    if (messageIds.length <= this._controller._pages * CHATVIEW_PAGE_SIZE) {
-      return
-    }
-    this._controller._pages++
-    var payload = {
-      chatId: chatId,
-      totalMessages: messageIds.length,
-      messages: this._messagesToRender(messageIds)
-    }
-    this._controller.sendToRenderer('DD_MESSAGES_LOADED', payload)
+    })
   }
 
   forwardMessage (msgId, chatId) {
     this._dc.forwardMessages(msgId, chatId)
     this._controller.chatList.selectChat(chatId)
   }
+
+  getMessageIds (chatId) {
+    const messageIds = this._dc.getChatMessages(chatId, C.DC_GCM_ADDDAYMARKER, 0)
+    return messageIds
+  }
+
+  getMessages (messageIds) {
+    const messages = {}
+    messageIds.forEach(messageId => {
+      if (messageId <= C.DC_MSG_ID_LAST_SPECIAL) return
+      messages[messageId] = this.messageIdToJson(messageId)
+    })
+    return messages
+  }
+}
+
+function convert (message) {
+  const msg = message.msg
+
+  Object.assign(msg, {
+    sentAt: msg.timestamp * 1000,
+    receivedAt: msg.receivedTimestamp * 1000,
+    direction: message.isMe ? 'outgoing' : 'incoming',
+    status: convertMessageStatus(msg.state)
+  })
+
+  if (msg.file) {
+    msg.attachment = {
+      url: msg.file,
+      contentType: convertContentType(message),
+      fileName: message.filename || msg.text,
+      fileSize: filesizeConverter(message.filesize)
+    }
+  }
+
+  return message
+}
+
+function convertMessageStatus (s) {
+  switch (s) {
+    case C.DC_STATE_IN_FRESH:
+      return 'sent'
+    case C.DC_STATE_OUT_FAILED:
+      return 'error'
+    case C.DC_STATE_IN_SEEN:
+      return 'read'
+    case C.DC_STATE_IN_NOTICED:
+      return 'read'
+    case C.DC_STATE_OUT_DELIVERED:
+      return 'delivered'
+    case C.DC_STATE_OUT_MDN_RCVD:
+      return 'read'
+    case C.DC_STATE_OUT_PENDING:
+      return 'sending'
+    case C.DC_STATE_UNDEFINED:
+      return 'error'
+  }
+}
+
+function convertContentType (message) {
+  const filemime = message.filemime
+
+  if (!filemime) return 'application/octet-stream'
+  if (filemime !== 'application/octet-stream') return filemime
+
+  switch (message.msg.viewType) {
+    case C.DC_MSG_IMAGE:
+      return 'image/jpg'
+    case C.DC_MSG_VOICE:
+      return 'audio/ogg'
+    case C.DC_MSG_FILE:
+      const type = mime.lookup(message.msg.file)
+      if (type) return type
+      else return 'application/octet-stream'
+    default:
+      return 'application/octet-stream'
+  }
 }