malice

public

Star0

Fork 0

Watch0

45 commits 2 branches 0 tags 0 releases4.4 MiB

Commit `11cc2db16d17`

tarball

atagen <boss@atagen.co>2026-10-24 12:38 UTC

1 file changed+49-4

web: add navigation history and preserve pagination position

Modified file: web/src/App.svelte+49 additions−4 deletions@@ -157,6 +157,7 @@
   let spaceChildrenLoading = false;
   let spaceChildrenError: string | null = null;
   let avatarByUser: Record<string, string | null> = {};
+  let restoringRoute = false;
 
   // account data is read from the local cache, which is empty on a fresh device until the first sync lands
   $: {
@@ -291,9 +292,47 @@
     return r.unread_messages + r.unread_mentions;
   }
 
+  function recordRoute(spaceId: string | null, roomId: string | null): void {
+    if (restoringRoute) return;
+    const url = new URL(window.location.href);
+    url.searchParams.delete('space');
+    url.searchParams.delete('room');
+    if (spaceId) url.searchParams.set('space', spaceId);
+    if (roomId) url.searchParams.set('room', roomId);
+    const next = `${url.pathname}${url.search}${url.hash}`;
+    const current = `${window.location.pathname}${window.location.search}${window.location.hash}`;
+    if (next !== current) window.history.pushState({ spaceId, roomId }, '', next);
+  }
+
+  async function restoreRoute(): Promise<void> {
+    const url = new URL(window.location.href);
+    const roomId = url.searchParams.get('room');
+    const spaceId = url.searchParams.get('space');
+    restoringRoute = true;
+    try {
+      if (roomId && $rooms.some((room) => room.room_id === roomId && !room.space)) {
+        selectedSpaceId = spaceId && $rooms.some((room) => room.room_id === spaceId && room.space) ? spaceId : null;
+        spaceChildrenError = null;
+        spaceChildIds = selectedSpaceId ? (await getSpaceChildren(selectedSpaceId)).room_ids ?? [] : null;
+        await selectRoom(roomId);
+      } else if (spaceId && $rooms.some((room) => room.room_id === spaceId && room.space)) {
+        await selectSpace(spaceId);
+      } else {
+        await selectHome();
+      }
+    } catch (e) {
+      pushBanner(e instanceof Error ? e.message : 'Could not restore navigation');
+    } finally {
+      restoringRoute = false;
+    }
+  }
+
   onMount(() => {
+    const onPopState = () => void restoreRoute();
+    window.addEventListener('popstate', onPopState);
     void boot();
     return () => {
+      window.removeEventListener('popstate', onPopState);
       disconnectEvents();
       stopTyping();
       if (readTimer !== null) window.clearTimeout(readTimer);
@@ -308,6 +347,7 @@
       if (session.user_id) {
         softLogout.set(null);
         await refreshRooms();
+        await restoreRoute();
         connectEvents();
         void loadProfile();
         void loadEncryption();
@@ -451,6 +491,7 @@
     spaceChildrenError = null;
     if (window.innerWidth > 640) navFolded.set(false);
     sidebarOpen = true;
+    recordRoute(null, null);
   }
 
   function toggleChannelsPane(): void {
@@ -504,6 +545,7 @@
     const spaceId = selectedSpaceId;
     if (spaceId) lastSpaceRooms.update((all) => ({ ...all, [spaceId]: roomId }));
     selectedRoomId.set(roomId);
+    recordRoute(selectedSpaceId, roomId);
     composer = drafts[roomId] ?? '';
     replyingTo = null;
     editing = null;
@@ -563,6 +605,7 @@
 
   let userScrollUntil = 0;
   let draggingScrollbar = false;
+  let paginationAnchor: { roomId: string; top: number; height: number } | null = null;
 
   function noteUserScroll(): void {
     userScrollUntil = performance.now() + 300;
@@ -581,6 +624,7 @@
     const gap = timelineEl.scrollHeight - timelineEl.scrollTop - timelineEl.clientHeight;
     if (gap < 80) stickToBottom = true;
     else if (draggingScrollbar || performance.now() < userScrollUntil) stickToBottom = false;
+    if (timelineEl.scrollTop < 80 && !hasStart && !paginateBusy) void paginate();
   }
 
   function pinTimeline(node: HTMLElement) {
@@ -597,7 +641,10 @@
     if (!roomId || list.length === 0) return;
     if (roomId !== $selectedRoomId) return;
     await tick();
-    if (stickToBottom) scrollToBottom();
+    if (paginationAnchor?.roomId === roomId && timelineEl && !stickToBottom) {
+      timelineEl.scrollTop = paginationAnchor.top + timelineEl.scrollHeight - paginationAnchor.height;
+      paginationAnchor = null;
+    } else if (stickToBottom) scrollToBottom();
     queueReadReceipt();
   }
 
@@ -1227,6 +1274,7 @@
   async function paginate(): Promise<void> {
     const roomId = $selectedRoomId;
     if (!roomId || paginateBusy) return;
+    if (timelineEl && !stickToBottom) paginationAnchor = { roomId, top: timelineEl.scrollTop, height: timelineEl.scrollHeight };
     paginateBusy = true;
     try {
       await paginateRoom(roomId);
@@ -1870,9 +1918,6 @@
           </button>
           {#if roomMenuOpen}
             <div class="room-menu" role="menu">
-              <button type="button" role="menuitem" on:click={() => roomMenuAction(() => (dialog = 'security'))}>
-                Security
-              </button>
               {#if selectedRoom.membership === 'Joined'}
                 <button
                   type="button"

malice

Commit 11cc2db16d17

Commit `11cc2db16d17`