From 653e2de752a97e377fc9963ba60d9408e7089528 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Tue, 8 Oct 2024 22:10:04 -0400
Subject: Flatten nested `channel` and `message` structs in events and API
 responses.

This structure didn't accomplish anything and made certain refactorings harder.
---
 hi-ui/src/apiServer.js       | 10 +++++-----
 hi-ui/src/lib/Message.svelte |  4 ++--
 hi-ui/src/store/channels.js  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'hi-ui/src')

diff --git a/hi-ui/src/apiServer.js b/hi-ui/src/apiServer.js
index f4a89a4..ec94e82 100644
--- a/hi-ui/src/apiServer.js
+++ b/hi-ui/src/apiServer.js
@@ -56,18 +56,18 @@ export function subscribeToEvents(resume_point) {
 
     switch (data.type) {
       case 'created':
-        channelsList.update((value) => value.addChannel(data.channel))
+        channelsList.update((value) => value.addChannel(data.id, data.name))
         break;
       case 'message':
         messages.update((value) => value.addMessage(data));
         break;
       case 'message_deleted':
-        messages.update((value) => value.deleteMessage(data.channel.id, data.message));
+        messages.update((value) => value.deleteMessage(data.channel.id, data.id));
         break;
       case 'deleted':
-        activeChannel.update((value) => value.deleteChannel(data.channel));
-        channelsList.update((value) => value.deleteChannel(data.channel));
-        messages.update((value) => value.deleteChannel(data.channel));
+        activeChannel.update((value) => value.deleteChannel(data.id));
+        channelsList.update((value) => value.deleteChannel(data.id));
+        messages.update((value) => value.deleteChannel(data.id));
         break;
       default:
         break;
diff --git a/hi-ui/src/lib/Message.svelte b/hi-ui/src/lib/Message.svelte
index efc6641..7c60ac0 100644
--- a/hi-ui/src/lib/Message.svelte
+++ b/hi-ui/src/lib/Message.svelte
@@ -5,7 +5,7 @@
 
     export let at;  // XXX: Omitted for now.
     export let sender;
-    export let message;
+    export let body;
 
     let timestamp = new Date(at).toTimeString();
 </script>
@@ -17,7 +17,7 @@
     </span>
     <span class="timestamp chip variant-soft absolute top-0 right-0">{at}</span>
     <section class="p-4">
-        <SvelteMarkdown source={message.body} />
+        <SvelteMarkdown source={body} />
     </section>
 </div>
 
diff --git a/hi-ui/src/store/channels.js b/hi-ui/src/store/channels.js
index 20702cc..bb6c86c 100644
--- a/hi-ui/src/store/channels.js
+++ b/hi-ui/src/store/channels.js
@@ -9,8 +9,8 @@ export class Channels {
 		return this;
 	}
 
-	addChannel(channel) {
-		this.channels = [...this.channels, channel];
+	addChannel(id, name) {
+		this.channels = [...this.channels, { id, name }];
 		this.sort();
 		return this;
 	}
-- 
cgit v1.2.3