1 files changed, 16 insertions, 13 deletions

diff --git a/hi-ui/src/lib/store/messages.js b/hi-ui/src/lib/store/messages.js
index 560b9e1..931b8fb 100644
--- a/hi-ui/src/lib/store/messages.js
+++ b/hi-ui/src/lib/store/messages.js
@@ -4,28 +4,31 @@ export class Messages {
 	}
 
 	inChannel(channel) {
-		return this.channels[channel] || [];
+		return this.channels[channel] = (this.channels[channel] || []);
 	}
 
-	addMessage(message) {
-		let {
-			channel,
-			...payload
-		} = message;
-		let channel_id = channel.id;
-		this.updateChannel(channel_id, (messages) => [...messages, payload]);
+	addMessage(channel, id, at, sender, body) {
+		this.updateChannel(channel, (messages) => [...messages, { id, at, sender, body }]);
 		return this;
 	}
 
-	addMessages(channel, payloads) {
-		this.updateChannel(channel, (messages) => [...messages, ...payloads]);
+	setMessages(messages) {
+		this.channels = {};
+		for (let { channel, id, at, sender, body } of messages) {
+			this.inChannel(channel).push({ id, at, sender, body, });
+		}
+		for (let channel in this.channels) {
+			this.channels[channel].sort((a, b) => a.at - b.at);
+		}
 		return this;
 	}
 
 
-	deleteMessage(channel, message) {
-		let messages = this.messages(channel).filter((msg) => msg.message.id != message);
-		this.channels[channel] = messages;
+	deleteMessage(message) {
+		for (let channel in this.channels) {
+			this.updateChannel(channel, (messages) => messages.filter((msg) => msg.id != message));
+		}
+		return this;
 	}
 
 	deleteChannel(id) {