Sending messages and local echo

src/qml/Chat/SendBox.qml

@@ -34,6 +34,7 @@ HRectangle {
             property bool textChangedSinceLostFocus: false
 
             function setTyping(typing) {
+                return
                 Backend.clients.get(chatPage.userId)
                        .setTypingState(chatPage.roomId, typing)
             }
@@ -60,8 +61,9 @@ HRectangle {
                 }
 
                 if (textArea.text === "") { return }
-                Backend.clients.get(chatPage.userId)
-                       .sendMarkdown(chatPage.roomId, textArea.text)
+
+                var args = [chatPage.roomId, textArea.text]
+                py.callClientCoro(chatPage.userId, "send_markdown", args)
                 area.clear()
             }
 

src/qml/Chat/Timeline/EventDelegate.qml

@@ -12,8 +12,8 @@ Column {
     function getPreviousItem(nth) {
         // Remember, index 0 = newest bottomest message
         nth = nth || 1
-        return model.index + nth - 1 < roomEventListView.model.count - 1 ?
-                roomEventListView.model.get(index + nth) : null
+        return roomEventListView.model.count - 1 > model.index + nth ?
+                roomEventListView.model.get(model.index + nth) : null
     }
 
     function isMessage(item) {
@@ -32,23 +32,28 @@ Column {
 
     readonly property bool isFirstEvent: model.eventType == "RoomCreateEvent"
 
-    readonly property bool combine:
-        previousItem &&
+    // Item roles may not be loaded yet, reason for all these checks
+    readonly property bool combine: Boolean(
+        model.date &&
+        previousItem && previousItem.eventType && previousItem.date &&
         isMessage(previousItem) == isMessage(model) &&
         ! talkBreak &&
         ! dayBreak &&
         previousItem.senderId === model.senderId &&
         minsBetween(previousItem.date, model.date) <= 5
+    )
 
-    readonly property bool dayBreak:
+    readonly property bool dayBreak: Boolean(
         isFirstEvent ||
-        previousItem &&
+        model.date && previousItem && previousItem.date &&
         model.date.getDate() != previousItem.date.getDate()
+    )
 
-    readonly property bool talkBreak:
-        previousItem &&
+    readonly property bool talkBreak: Boolean(
+        model.date && previousItem && previousItem.date &&
         ! dayBreak &&
         minsBetween(previousItem.date, model.date) >= 20
+    )
 
 
     property int standardSpacing: 16

src/qml/EventHandlers/rooms.js

@@ -43,7 +43,6 @@ function onRoomUpdated(user_id, category, room_id, display_name, avatar_url,
         "inviter":       inviter,
         "leftEvent":     left_event
     })
-    //print("room up", rooms.toJson())
 }
 
 
@@ -65,19 +64,35 @@ function onTimelineEventReceived(
     event_type, room_id, event_id, sender_id, date, content,
     content_type, is_local_echo, show_name_line, translatable, target_user_id
 ) {
-    models.timelines.upsert({"eventId": event_id}, {
+    var item = {
         "eventType":    py.getattr(event_type, "__name__"),
         "roomId":       room_id,
         "eventId":      event_id,
         "senderId":     sender_id,
         "date":         date,
         "content":      content,
-        "contentType":  content,
-        "isLocalEcho":  is_local_echo,
+        "contentType":  content_type,
         "showNameLine": show_name_line,
         "translatable": translatable,
-        "targetUserId": target_user_id
-    }, true, 1000)
+        "targetUserId": target_user_id,
+        "isLocalEcho":  is_local_echo,
+    }
+
+    // Replace any matching local echo
+    var found = models.timelines.getIndices({
+        "roomId":       room_id,
+        "senderId":     sender_id,
+        "content":      content,
+        "isLocalEcho":  true
+    }, 1, 500)
+    if (found.length > 0) {
+        models.timelines.set(found[0], item)
+        return
+    }
+
+    // Multiple clients will emit duplicate events with the same eventId
+    models.timelines.upsert({"eventId": event_id},  item, true, 500)
 }
 
+
 var onTimelineMessageReceived = onTimelineEventReceived