5 files changed, 81 insertions, 43 deletions

diff --git a/ui/lib/session.svelte.js b/ui/lib/session.svelte.js
index 21a391d..2dae3c4 100644
--- a/ui/lib/session.svelte.js
+++ b/ui/lib/session.svelte.js
@@ -6,16 +6,62 @@ import * as api from './apiServer.js';
 import * as r from './state/remote/state.svelte.js';
 import * as l from './state/local/channels.svelte.js';
 import { Watchdog } from './watchdog.js';
+import { DateTime } from 'luxon';
+import { render } from '$lib/markdown.js';
+
+class Channel {
+  static fromRemote({ at, id, name }, messages, meta) {
+    const sentAt = messages
+      .filter((message) => message.channel === id)
+      .map((message) => message.at);
+    const lastEventAt = Math.max(at, ...sentAt);
+    const lastReadAt = meta.get(id)?.lastReadAt;
+
+    const hasUnreads = lastReadAt === undefined || lastEventAt > lastReadAt;
+    return new Channel({ at, id, name, hasUnreads });
+  }
+
+  constructor({ at, id, name, hasUnreads }) {
+    this.at = at;
+    this.id = id;
+    this.name = name;
+    this.hasUnreads = hasUnreads;
+  }
+}
+
+class Message {
+  static fromRemote({ id, at, channel, sender, body, renderedBody }, users) {
+    return new Message({
+      id,
+      at,
+      channel,
+      sender: users.get(sender),
+      body,
+      renderedBody
+    });
+  }
+
+  constructor({ id, at, channel, sender, body, renderedBody }) {
+    this.id = id;
+    this.at = at;
+    this.channel = channel;
+    this.sender = sender;
+    this.body = body;
+    this.renderedBody = renderedBody;
+  }
+}
 
 class Session {
   remote = $state();
   local = $state();
   currentUser = $derived(this.remote.currentUser);
   users = $derived(this.remote.users.all);
-  channels = $derived(this.remote.channels.all);
   messages = $derived(
-    this.remote.messages.all.map((message) =>
-      message.resolve({ sender: (id) => this.users.get(id) })
+    this.remote.messages.all.map((message) => Message.fromRemote(message, this.users))
+  );
+  channels = $derived(
+    this.remote.channels.all.map((channel) =>
+      Channel.fromRemote(channel, this.messages, this.local.all)
     )
   );
 
diff --git a/ui/lib/state/remote/channels.svelte.js b/ui/lib/state/remote/channels.svelte.js
index 64edb09..8b190dd 100644
--- a/ui/lib/state/remote/channels.svelte.js
+++ b/ui/lib/state/remote/channels.svelte.js
@@ -1,10 +1,26 @@
-import { SvelteMap } from 'svelte/reactivity';
+import { DateTime } from 'luxon';
+
+class Channel {
+  static boot({ at, id, name }) {
+    return new Channel({
+      at: DateTime.fromISO(at),
+      id,
+      name
+    });
+  }
+
+  constructor({ at, id, name }) {
+    this.at = at;
+    this.id = id;
+    this.name = name;
+  }
+}
 
 export class Channels {
-  all = $state();
+  all = $state([]);
 
   static boot(channels) {
-    const all = new SvelteMap(channels.map((channel) => [channel.id, channel]));
+    const all = channels.map((channel) => Channel.boot(channel));
     return new Channels({ all });
   }
 
@@ -12,8 +28,8 @@ export class Channels {
     this.all = all;
   }
 
-  add({ id, name }) {
-    this.all.set(id, { id, name });
+  add({ at, id, name }) {
+    this.all.set(id, Channel.boot({ at, id, name }));
   }
 
   remove(id) {
diff --git a/ui/lib/state/remote/messages.svelte.js b/ui/lib/state/remote/messages.svelte.js
index c6d31f0..0a081bb 100644
--- a/ui/lib/state/remote/messages.svelte.js
+++ b/ui/lib/state/remote/messages.svelte.js
@@ -1,7 +1,7 @@
 import { DateTime } from 'luxon';
 import { render } from '$lib/markdown.js';
 
-export class Message {
+class Message {
   static boot({ id, at, channel, sender, body }) {
     return new Message({
       id,
@@ -21,11 +21,6 @@ export class Message {
     this.body = body;
     this.renderedBody = renderedBody;
   }
-
-  resolve(get) {
-    const { sender, ...rest } = this;
-    return new Message({ sender: get.sender(sender), ...rest });
-  }
 }
 
 export class Messages {
diff --git a/ui/routes/(app)/+layout.svelte b/ui/routes/(app)/+layout.svelte
index a4ae442..c7e1f22 100644
--- a/ui/routes/(app)/+layout.svelte
+++ b/ui/routes/(app)/+layout.svelte
@@ -22,27 +22,7 @@
   let pageContext = getContext('page');
   let channel = $derived(page.params.channel);
 
-  let rawChannels = $derived(session.channels);
-  let rawChannelsMeta = $derived(session.local.all);
-  let rawMessages = $derived(session.messages);
-
-  function enrichChannels(channels, channelsMeta, messages) {
-    const enrichedChannels = [];
-    for (const ch of channels.values()) {
-      const channelMessages = messages.filter((message) => message.channel === ch.id);
-      const lastMessage = channelMessages.slice(-1)[0];
-      const lastMessageAt = lastMessage?.at;
-      const lastReadAt = channelsMeta.get(ch.id)?.lastReadAt;
-      const hasUnreads = lastReadAt === undefined || lastMessageAt > lastReadAt;
-      enrichedChannels.push({
-        ...ch,
-        hasUnreads
-      });
-    }
-    return enrichedChannels;
-  }
-
-  const enrichedChannels = $derived(enrichChannels(rawChannels, rawChannelsMeta, rawMessages));
+  let channels = $derived(session.channels);
 
   function setUpGestures() {
     if (!browser) {
@@ -134,7 +114,7 @@
 
 <div id="interface">
   <nav id="sidebar" data-expanded={pageContext.showMenu}>
-    <ChannelList active={channel} channels={enrichedChannels} />
+    <ChannelList active={channel} {channels} />
     <div class="create-channel">
       <CreateChannelForm {createChannel} />
     </div>
diff --git a/ui/routes/(app)/ch/[channel]/+page.svelte b/ui/routes/(app)/ch/[channel]/+page.svelte
index 33a9bdf..76bb638 100644
--- a/ui/routes/(app)/ch/[channel]/+page.svelte
+++ b/ui/routes/(app)/ch/[channel]/+page.svelte
@@ -10,9 +10,10 @@
   const { session, outbox } = data;
   let activeChannel;
 
-  const channel = $derived(page.params.channel);
-  const messages = $derived(session.messages.filter((message) => message.channel === channel));
-  const unsent = $derived(outbox.messages.filter((message) => message.channel === channel));
+  const channelId = $derived(page.params.channel);
+  const channel = $derived(session.channels.find((channel) => channel.id === channelId));
+  const messages = $derived(session.messages.filter((message) => message.channel === channelId));
+  const unsent = $derived(outbox.messages.filter((message) => message.channel === channelId));
   const deleted = $derived(outbox.deleted.map((message) => message.messageId));
   const unsentSkeletons = $derived(
     unsent.map((message) => message.toSkeleton($state.snapshot(session.currentUser)))
@@ -45,9 +46,9 @@
 
   function setLastRead() {
     const lastInView = getLastVisibleMessage();
-    if (lastInView) {
-      const at = DateTime.fromISO(lastInView.dataset.at);
-      session.local.updateLastReadAt(channel, at);
+    const at = !!lastInView ? DateTime.fromISO(lastInView.dataset.at) : channel?.at;
+    if (!!at) {
+      session.local.updateLastReadAt(channelId, at);
     }
   }
 
@@ -76,7 +77,7 @@
   }
 
   async function sendMessage(message) {
-    outbox.postToChannel(channel, message);
+    outbox.postToChannel(channelId, message);
   }
 
   async function deleteMessage(id) {