merge "refactor: update to latest version of Leaf / Roomy SDK. (#154)" conflicts

Author: sameoldlab

src/lib/components/RoomBar.svelte

@@ -25,12 +25,14 @@
   let availableThreads = derivePromise([], async () =>
     ((await g.space?.threads.items()) || []).filter((x) => !x.softDeleted),
   );
+
   let categories = derivePromise([], async () => {
     if (!g.space) return [];
     return (await g.space.sidebarItems.items())
       .map((x) => x.tryCast(Category) as Category)
       .filter((x) => !!x);
   });
+
   let sidebarItems = derivePromise([], async () => {
     if (!g.space) return [];
     return await g.space.sidebarItems.items();
@@ -50,11 +52,11 @@
     if (!g.space) return;
     if (!showSpaceSettings) {
       spaceNameInput = g.space.name;
-      newSpaceHandle = g.space?.handles.get(0) || "";
+      newSpaceHandle = g.space?.handles((x) => x.get(0)) || "";
       verificationFailed = false;
       saveSpaceLoading = false;
       Promise.all(
-        Object.keys(g.space.bans.toJSON()).map((x) => getProfile(x)),
+        Object.keys(g.space.bans((x) => x.toJSON())).map((x) => getProfile(x)),
       ).then(
         (profiles) =>
           (bannedHandlesInput = profiles.map((x) => x.handle).join(", ")),
@@ -72,10 +74,12 @@
           .map((x) => user.agent!.resolveHandle({ handle: x })),
       )
     ).map((x) => x.data.did);
-    g.space.bans.clear();
-    for (const ban of bannedIds) {
-      g.space.bans.set(ban, true);
-    }
+    g.space.bans((bans) => {
+      bans.clear();
+      for (const ban of bannedIds) {
+        bans.set(ban, true);
+      }
+    });
     g.space.commit();
     showSpaceSettings = false;
   }
@@ -89,7 +93,7 @@
     saveSpaceLoading = true;
 
     if (!newSpaceHandle) {
-      g.space.handles.clear();
+      g.space.handles((h) => h.clear());
       g.space.commit();
       saveSpaceLoading = false;
       showSpaceSettings = false;
@@ -106,8 +110,10 @@
         saveSpaceLoading = false;
         return;
       }
-      g.space.handles.clear();
-      g.space.handles.push(newSpaceHandle);
+      g.space.handles((h) => {
+        h.clear();
+        h.push(newSpaceHandle);
+      });
       g.space.commit();
       saveSpaceLoading = false;
       showSpaceSettings = false;

src/routes/(app)/[[spaceIndicator=dash]]/[space=space]/+layout.svelte

@@ -8,6 +8,8 @@
   import { page } from "$app/state";
   import { outerWidth } from "svelte/reactivity/window";
 
+  let { children } = $props();
+  let isMobile = $derived((outerWidth.current || 0) < 640);
   // TODO: track users via the space data
   let users = derivePromise([], async () => {
     if (!g.space) {
@@ -19,7 +21,7 @@
       for (const timelineItem of await channel.timeline.items()) {
         const message = timelineItem.tryCast(Message);
         if (message && message.authors.length > 0) {
-          for (const author of message.authors.toArray()) {
+          for (const author of message.authors((x) => x.toArray())) {
             result.add(author);
           }
         }
@@ -76,11 +78,9 @@
 
   setContext("users", users);
   setContext("contextItems", contextItems);
-  let { children } = $props();
-  let isMobile = $derived((outerWidth.current || 0) < 640);
 </script>
 
-{#if g.channel || !(page.params.thread || page.params.channel)}
+{#if g.space}
   <main
     class="drawer-content h-full overflox-x-auto flex flex-col gap-4 p-4 overflow-clip bg-base-100 {!isMobile
       ? 'grow min-w-0 rounded-xl border-4 border-base-300'
@@ -90,6 +90,7 @@
   >
     {@render children()}
   </main>
+  <!-- If there is no space. -->
 {:else}
   <span class="loading loading-spinner mx-auto w-25"></span>
 {/if}