malice

public

Star0

Fork 0

Watch0

72 commits 2 branches 0 tags 0 releases4.4 MiB

Commit `1e2ab8104071`

tarball

atagen <boss@atagen.co>2026-10-25 09:09 UTC

6 files changed+79-5

history: publish recent loading state

Modified file: crates/malice-core/src/feed.rs+16 additions−2 deletions@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use futures_util::{Stream, StreamExt, stream};
 use macltok::{
     ConnectionState, EncryptionState, ImagePacks, MentionsPage, MentionsUpdate, MirrorHandle,
-    RoomSummary, SessionStatus, State, StateChange, TimelineChange, TimelineId, TimelineItem,
-    UploadOutcome, VerificationState, imbl::Vector,
+    RecentHistoryState, RoomSummary, SessionStatus, State, StateChange, TimelineChange, TimelineId,
+    TimelineItem, UploadOutcome, VerificationState, imbl::Vector,
 };
 use serde::Serialize;
 
@@ -20,10 +20,15 @@ pub enum WireEvent {
         verification: Option<VerificationState>,
         image_packs: ImagePacks,
         mentions: Option<MentionsPage>,
+        recent_history: HashMap<String, RecentHistoryState>,
     },
     Mentions {
         update: MentionsUpdate,
     },
+    RecentHistory {
+        room_id: String,
+        state: RecentHistoryState,
+    },
     ImagePacks {
         packs: ImagePacks,
     },
@@ -115,6 +120,11 @@ pub fn snapshot_event(state: &State) -> WireEvent {
         verification: state.verification.clone(),
         image_packs: state.image_packs.clone(),
         mentions: state.mentions.clone(),
+        recent_history: state
+            .recent_history
+            .iter()
+            .map(|(room_id, status)| (room_id.as_str().to_owned(), status.clone()))
+            .collect(),
     }
 }
 
@@ -184,6 +194,10 @@ pub fn wire_events(change: &StateChange) -> Vec<WireEvent> {
         StateChange::Mentions(update) => vec![WireEvent::Mentions {
             update: update.clone(),
         }],
+        StateChange::RecentHistory { room_id, state } => vec![WireEvent::RecentHistory {
+            room_id: room_id.as_str().to_owned(),
+            state: state.clone(),
+        }],
         StateChange::Failed(failure) => vec![error(&failure.message)],
         StateChange::SessionSaveFailed(_) => {
             vec![error(

Modified file: crates/malice-server/src/state.rs+1

@@ -411,6 +411,7 @@ async fn wait_authenticated(mirror: &MirrorHandle) -> Option<String> {

411411 | StateChange::Timeline { .. }

412412 | StateChange::History { .. }

413413 | StateChange::HistoryRepair(_)

414+ | StateChange::RecentHistory { .. }

414415 | StateChange::Typing(_)

415416 | StateChange::Upload { .. }

416417 | StateChange::UploadFinished { .. }

Modified file: crates/malice-worker/src/account.rs+1

@@ -112,6 +112,7 @@ async fn wait_authenticated(mirror: &MirrorHandle) -> Option<String> {

112112 | StateChange::Timeline { .. }

113113 | StateChange::History { .. }

114114 | StateChange::HistoryRepair(_)

115+ | StateChange::RecentHistory { .. }

115116 | StateChange::Typing(_)

116117 | StateChange::Upload { .. }

117118 | StateChange::UploadFinished { .. }

Modified file: web/src/App.svelte+31 additions−3 deletions@@ -31,6 +31,7 @@
     getSession,
     getSpaceChildren,
     fillHistoryGap,
+    startRecentHistory,
     joinRoom,
     leaveRoom,
     logout,
@@ -64,8 +65,9 @@
     membersLoading,
     mentionsSnapshot,
     pushBanner,
-    markTimelineOpened,
     imagePacks,
+    markTimelineOpened,
+    recentHistory,
     resetClientState,
     rooms,
     selectedRoomId,
@@ -127,10 +129,12 @@
   let leaveBusy = false;
   let paginateBusy = false;
   let fillingGaps: Record<string, string> = {};
+  let recentRetrying: Record<string, boolean> = {};
   let historyAccount: string | null | undefined;
   $: if ($sessionUser !== historyAccount) {
     historyAccount = $sessionUser;
     fillingGaps = {};
+    recentRetrying = {};
   }
   let reacting = false;
   let composer = '';
@@ -194,6 +198,7 @@
     wasOnline = online;
   }
   $: selectedRoom = $rooms.find((r) => r.room_id === $selectedRoomId) ?? null;
+  $: recentState = $selectedRoomId ? $recentHistory[$selectedRoomId] : undefined;
   $: roomPacks = enabledPacks(packsForRoom($imagePacks, $selectedRoomId, $rooms), $disabledPackImages);
   $: roomEmotes = customEmotes(roomPacks);
   $: usableQuickReactions = enabledQuickReactions($quickReactions, allPacks($imagePacks), $disabledPackImages);
@@ -1358,7 +1363,7 @@
 
   async function paginate(): Promise<void> {
     const roomId = $selectedRoomId;
-    if (!roomId || paginateBusy) return;
+    if (!roomId || paginateBusy || $recentHistory[roomId] === 'Loading') return;
     paginateBusy = true;
     try {
       await paginateRoom(roomId);
@@ -1385,6 +1390,19 @@
     }
   }
 
+  async function retryRecentHistory(roomId: string): Promise<void> {
+    if (recentRetrying[roomId]) return;
+    recentRetrying = { ...recentRetrying, [roomId]: true };
+    try {
+      await startRecentHistory(roomId);
+    } catch (e) {
+      pushBanner(e instanceof Error ? e.message : 'Loading recent history failed');
+    } finally {
+      const { [roomId]: _done, ...rest } = recentRetrying;
+      recentRetrying = rest;
+    }
+  }
+
   async function loadMembers(roomId: string): Promise<void> {
     if (membersFor === roomId && $membersLoading) return;
     membersFor = roomId;
@@ -2454,10 +2472,20 @@
         >
           <div class="timeline-inner" use:pinTimeline>
             <div class="timeline-top">
+              {#if recentState === 'Loading'}
+                <p class="side-note">Loading recent history…</p>
+              {:else if recentState && typeof recentState === 'object'}
+                <div class="history-gap">
+                  <span>Recent history could not be loaded</span>
+                  <button type="button" class="ghost-btn" disabled={!!recentRetrying[selectedRoom.room_id]} on:click={() => void retryRecentHistory(selectedRoom.room_id)}>
+                    {recentRetrying[selectedRoom.room_id] ? 'Loading…' : 'Retry'}
+                  </button>
+                </div>
+              {/if}
               {#if hasStart}
                 <p class="start-note">Beginning of history</p>
               {:else}
-                <button type="button" class="ghost-btn" disabled={paginateBusy} on:click={() => void paginate()}>
+                <button type="button" class="ghost-btn" disabled={paginateBusy || recentState === 'Loading'} on:click={() => void paginate()}>
                   {paginateBusy ? 'Loading…' : 'Load older messages'}
                 </button>
               {/if}

Modified file: web/src/lib/store.ts+12 additions@@ -12,6 +12,8 @@ import {
   EMPTY_IMAGE_PACKS,
   parseEncryptionState,
   parseImagePacks,
+  parseRecentHistoryMap,
+  parseRecentHistoryState,
   parseRoomList,
   parseTimelineList,
   parseVerificationState
@@ -21,6 +23,7 @@ import type {
   EventContext,
   ImagePacks,
   MemberSummary,
+  RecentHistoryState,
   RoomSummary,
   TimelineItem,
   VerificationState
@@ -43,6 +46,7 @@ export const rooms = writable<RoomSummary[]>([]);
 export const timelines = writable<Record<string, TimelineItem[]>>({});
 export const pinnedTimelines = writable<Record<string, TimelineItem[]>>({});
 export const pinnedTimelineVersions = writable<Record<string, number>>({});
+export const recentHistory = writable<Record<string, RecentHistoryState>>({});
 export interface EventContextState {
   room_id: string;
   request_id: string;
@@ -80,6 +84,7 @@ export function resetClientState(): void {
   timelines.set({});
   pinnedTimelines.set({});
   pinnedTimelineVersions.set({});
+  recentHistory.set({});
   eventContexts.set({});
   connection.set('connecting');
   selectedRoomId.set(null);
@@ -154,6 +159,7 @@ function handlePayload(text: string): void {
   const kind = data['type'];
   if (kind === 'snapshot') {
     if (typeof data['connection'] === 'string') setConnection(data['connection']);
+    recentHistory.set(parseRecentHistoryMap(data['recent_history']));
     const mentions = parseMentionsPage(data['mentions']);
     if (mentions) publishMentionsPage(mentions);
     setRooms(data['rooms']);
@@ -185,6 +191,12 @@ function handlePayload(text: string): void {
     if (update) publishMentionsPage(update.snapshot);
     return;
   }
+  if (kind === 'recent_history') {
+    const roomId = data['room_id'];
+    const state = parseRecentHistoryState(data['state']);
+    if (typeof roomId === 'string' && state) recentHistory.update((all) => ({ ...all, [roomId]: state }));
+    return;
+  }
   if (kind === 'image_packs') {
     imagePacks.set(parseImagePacks(data['packs']));
     return;

Modified file: web/src/lib/types.ts+18 additions@@ -656,6 +656,24 @@ export type TimelineItem =
   | { kind: 'start' }
   | { kind: 'unknown'; label: string };
 
+export type RecentHistoryState = 'Idle' | 'Loading' | 'Loaded' | { Failed: string };
+
+export function parseRecentHistoryState(raw: unknown): RecentHistoryState | null {
+  if (raw === 'Idle' || raw === 'Loading' || raw === 'Loaded') return raw;
+  if (isRecord(raw) && typeof raw['Failed'] === 'string') return { Failed: raw['Failed'] };
+  return null;
+}
+
+export function parseRecentHistoryMap(raw: unknown): Record<string, RecentHistoryState> {
+  const out: Record<string, RecentHistoryState> = {};
+  if (!isRecord(raw)) return out;
+  for (const [roomId, value] of Object.entries(raw)) {
+    const state = parseRecentHistoryState(value);
+    if (state) out[roomId] = state;
+  }
+  return out;
+}
+
 export interface HistoryGap {
   id: string;
   older_boundary: string | null;

malice

Commit 1e2ab8104071

Commit `1e2ab8104071`