1 files changed, 10 insertions, 12 deletions
diff --git a/ui/lib/state/remote/state.svelte.js b/ui/lib/state/remote/state.svelte.js
index a30e0fe..fb46489 100644
--- a/ui/lib/state/remote/state.svelte.js
+++ b/ui/lib/state/remote/state.svelte.js
@@ -4,27 +4,25 @@ import { Messages } from './messages.svelte.js';
 
 export class State {
   currentUser = $state();
-  users = $state();
-  channels = $state();
-  messages = $state();
+  users = $state(new Users());
+  channels = $state(new Channels());
+  messages = $state(new Messages());
 
-  static boot({ currentUser, heartbeat, users, channels, messages, resumePoint }) {
-    return new State({
+  static boot({ currentUser, heartbeat, resumePoint, events }) {
+    const state = new State({
       currentUser: User.boot(currentUser),
       heartbeat,
-      users: Users.boot(users),
-      channels: Channels.boot(channels),
-      messages: Messages.boot(messages),
       resumePoint,
     });
+    for (const event of events) {
+      state.onEvent(event);
+    }
+    return state;
   }
 
-  constructor({ currentUser, heartbeat, users, channels, messages, resumePoint }) {
+  constructor({ currentUser, heartbeat, resumePoint }) {
     this.currentUser = currentUser;
     this.heartbeat = heartbeat;
-    this.users = users;
-    this.channels = channels;
-    this.messages = messages;
     this.resumePoint = resumePoint;
   }