Build system, messages support and more

src/qml/EventHandlers/rooms.js

@@ -1,26 +1,28 @@
-function clientId(user_id, category, room_id) {
-    return user_id + " " + room_id + " " + category
-}
-
-
 function onRoomUpdated(user_id, category, room_id, display_name, avatar_url,
                        topic, last_event_date, inviter, left_event) {
 
-    var client_id = clientId(user_id, category, room_id)
-    var rooms     = models.rooms
+    models.roomCategories.upsert({"userId": user_id, "name": category}, {
+        "userId": user_id,
+        "name":   category
+    })
+
+    var rooms = models.rooms
+
+    function roles(for_category) {
+        return {"userId": user_id, "roomId": room_id, "category": for_category}
+    }
 
     if (category == "Invites") {
-        rooms.popWhere("clientId", clientId(user_id, "Rooms", room_id))
-        rooms.popWhere("clientId", clientId(user_id, "Left", room_id))
+        rooms.popWhere(roles("Rooms"), 1)
+        rooms.popWhere(roles("Left"), 1)
     }
     else if (category == "Rooms") {
-        rooms.popWhere("clientId", clientId(user_id, "Invites", room_id))
-        rooms.popWhere("clientId", clientId(user_id, "Left", room_id))
+        rooms.popWhere(roles("Invites"), 1)
+        rooms.popWhere(roles("Left"), 1)
     }
     else if (category == "Left") {
-        var old_room  =
-            rooms.popWhere("clientId", clientId(user_id, "Rooms", room_id)) ||
-            rooms.popWhere("clientId", clientId(user_id, "Invites", room_id))
+        var old_room  = rooms.popWhere(roles("Invites"), 1)[0] ||
+                        rooms.popWhere(roles("Rooms"), 1)[0]
 
         if (old_room) {
             display_name = old_room.displayName
@@ -30,8 +32,7 @@ function onRoomUpdated(user_id, category, room_id, display_name, avatar_url,
         }
     }
 
-    rooms.upsert("clientId", client_id , {
-        "clientId":      client_id,
+    rooms.upsert(roles(category), {
         "userId":        user_id,
         "category":      category,
         "roomId":        room_id,
@@ -47,8 +48,8 @@ function onRoomUpdated(user_id, category, room_id, display_name, avatar_url,
 
 
 function onRoomDeleted(user_id, category, room_id) {
-    var client_id = clientId(user_id, category, room_id)
-    return models.rooms.popWhere("clientId", client_id, 1)
+    var roles = {"userId": user_id, "roomId": room_id, "category": category}
+    models.rooms.popWhere(roles, 1)
 }
 
 

src/qml/EventHandlers/rooms_timeline.js

@@ -0,0 +1,12 @@
+function onHtmlMessageReceived(type, room_id, event_id, sender_id, date,
+                               is_local_echo, content) {
+    models.timelines.upsert({"eventId": event_id}, {
+        "type":        type,
+        "roomId":      room_id,
+        "eventId":     event_id,
+        "senderId":    sender_id,
+        "date":        date,
+        "isLocalEcho": is_local_echo,
+        "content":     content,
+    }, true, 1000)
+}

src/qml/EventHandlers/users.js

@@ -2,18 +2,17 @@ function onAccountUpdated(user_id) {
     models.accounts.append({"userId": user_id})
 }
 
-function AccountDeleted(user_id) {
-    models.accounts.popWhere("userId", user_id, 1)
+function onAccountDeleted(user_id) {
+    models.accounts.popWhere({"userId": user_id}, 1)
 }
 
 function onUserUpdated(user_id, display_name, avatar_url, status_message) {
-    models.users.upsert("userId", user_id, {
+    models.users.upsert({"userId": user_id}, {
         "userId":        user_id,
         "displayName":   display_name,
         "avatarUrl":     avatar_url,
         "statusMessage": status_message
     })
-
 }
 
 function onDeviceUpdated(user_id, device_id, ed25519_key, trust, display_name,