add socket.io back, cleanup
Change-Id: I74e043268c23fb45371f1e397ca2931ca177afc3
diff --git a/model/Conversation.js b/model/Conversation.js
index 058742a..85fe48f 100644
--- a/model/Conversation.js
+++ b/model/Conversation.js
@@ -67,7 +67,19 @@
}
addMessage(message) {
- this.messages.push(message)
+ if (this.messages.length === 0)
+ this.messages.push(message)
+ else if (message.id === this.messages[this.messages.length - 1].linearizedParent) {
+ this.messages.push(message)
+ } else if (message.linearizedParent === this.messages[0].id) {
+ this.messages.unshift(message)
+ } else {
+ console.log("Can't insert message " + message.id)
+ }
+ }
+
+ addLoadedMessages(messages) {
+ messages.forEach(message => this.addMessage(message))
}
getMessages() {