malice

public

Star0

Fork 0

Watch0

47 commits 2 branches 0 tags 0 releases4.4 MiB

Commit `f7069be9f61e`

tarball

atagen <boss@atagen.co>2026-10-24 13:11 UTC

9 files changed+5-283

build: remove unsupported event context requests

Modified file: crates/malice-core/src/request.rs−61 deletions@@ -77,32 +77,6 @@ pub enum Request {
         #[serde(default)]
         room_id: String,
     },
-    EventContext {
-        #[serde(default)]
-        room_id: String,
-        #[serde(default)]
-        event_id: String,
-        #[serde(default)]
-        before_limit: u32,
-        #[serde(default)]
-        after_limit: u32,
-    },
-    EventContextBefore {
-        #[serde(default)]
-        room_id: String,
-        #[serde(default)]
-        token: String,
-        #[serde(default)]
-        limit: u32,
-    },
-    EventContextAfter {
-        #[serde(default)]
-        room_id: String,
-        #[serde(default)]
-        token: String,
-        #[serde(default)]
-        limit: u32,
-    },
     Join {
         #[serde(default)]
         room: String,
@@ -507,41 +481,6 @@ pub async fn dispatch(
             handle.paginate(TimelineId::Room(room_id), 30).await?;
             Ok(Reply::Done)
         }
-        Request::EventContext {
-            room_id,
-            event_id,
-            before_limit,
-            after_limit,
-        } => {
-            let room_id = parse_room_id(&room_id)?;
-            let event_id = parse_event_id(&event_id)?;
-            let context = handle
-                .event_context(&room_id, &event_id, before_limit, after_limit)
-                .await?;
-            Ok(Reply::Json(json!(context)))
-        }
-        Request::EventContextBefore {
-            room_id,
-            token,
-            limit,
-        } => {
-            let room_id = parse_room_id(&room_id)?;
-            let page = handle
-                .event_context_before(&room_id, &token, limit)
-                .await?;
-            Ok(Reply::Json(json!(page)))
-        }
-        Request::EventContextAfter {
-            room_id,
-            token,
-            limit,
-        } => {
-            let room_id = parse_room_id(&room_id)?;
-            let page = handle
-                .event_context_after(&room_id, &token, limit)
-                .await?;
-            Ok(Reply::Json(json!(page)))
-        }
         Request::Join { room } => {
             let room = parse_room_or_alias(&room)?;
             let room_id = handle.join_room(room, Vec::new()).await?;

Modified file: crates/malice-server/src/routes.rs−95 deletions@@ -56,28 +56,6 @@ struct PaginateBody {
 }
 
 #[derive(Debug, Deserialize)]
-struct EventContextBody {
-    #[serde(default)]
-    room_id: String,
-    #[serde(default)]
-    event_id: String,
-    #[serde(default)]
-    before_limit: u32,
-    #[serde(default)]
-    after_limit: u32,
-}
-
-#[derive(Debug, Deserialize)]
-struct EventContextPageBody {
-    #[serde(default)]
-    room_id: String,
-    #[serde(default)]
-    token: String,
-    #[serde(default)]
-    limit: u32,
-}
-
-#[derive(Debug, Deserialize)]
 struct JoinBody {
     #[serde(default)]
     room: String,
@@ -682,76 +660,6 @@ async fn rooms_paginate(
     )
 }
 
-async fn rooms_context(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    body: axum::Json<EventContextBody>,
-) -> Response {
-    let (user, _) = match auth(&state, &headers).await {
-        Ok(pair) => pair,
-        Err(error) => return error.into_response(),
-    };
-    respond(
-        dispatch(
-            &user.handle,
-            &user.mirror,
-            Request::EventContext {
-                room_id: body.0.room_id,
-                event_id: body.0.event_id,
-                before_limit: body.0.before_limit,
-                after_limit: body.0.after_limit,
-            },
-        )
-        .await,
-    )
-}
-
-async fn rooms_context_before(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    body: axum::Json<EventContextPageBody>,
-) -> Response {
-    let (user, _) = match auth(&state, &headers).await {
-        Ok(pair) => pair,
-        Err(error) => return error.into_response(),
-    };
-    respond(
-        dispatch(
-            &user.handle,
-            &user.mirror,
-            Request::EventContextBefore {
-                room_id: body.0.room_id,
-                token: body.0.token,
-                limit: body.0.limit,
-            },
-        )
-        .await,
-    )
-}
-
-async fn rooms_context_after(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    body: axum::Json<EventContextPageBody>,
-) -> Response {
-    let (user, _) = match auth(&state, &headers).await {
-        Ok(pair) => pair,
-        Err(error) => return error.into_response(),
-    };
-    respond(
-        dispatch(
-            &user.handle,
-            &user.mirror,
-            Request::EventContextAfter {
-                room_id: body.0.room_id,
-                token: body.0.token,
-                limit: body.0.limit,
-            },
-        )
-        .await,
-    )
-}
-
 async fn rooms_join(
     State(state): State<AppState>,
     headers: HeaderMap,
@@ -1138,9 +1046,6 @@ pub fn router(state: AppState, web_dir: Option<String>) -> Router {
         .route("/rooms/close", post(rooms_close))
         .route("/rooms/send", post(rooms_send))
         .route("/rooms/paginate", post(rooms_paginate))
-        .route("/rooms/context", post(rooms_context))
-        .route("/rooms/context/before", post(rooms_context_before))
-        .route("/rooms/context/after", post(rooms_context_after))
         .route(
             "/rooms/upload",
             post(rooms_upload).layer(DefaultBodyLimit::max(21 * 1024 * 1024)),

Modified file: web/src/app.css+1

@@ -894,6 +894,7 @@ input, textarea { font: inherit; }

894894 }

895895 .app > .rail, .app > .sidebar { visibility: visible !important; }

896896 .account .me-names, .account-actions { display: none; }

897+ .account { padding-top: 10px; padding-bottom: 12px; }

897898 .pane-resize { display: none; }

898899 .app > .sidebar { transition: transform var(--pane-ease); }

899900 .app > .sidebar > *, .app > .members > * { min-width: 0; }

Modified file: web/src/lib/api.ts+1 additions−7 deletions@@ -1,6 +1,6 @@
 // Backend-agnostic API surface. Every call forwards to whichever transport
 // this build was compiled for, hosted (fetch + SSE) or on-device (worker).
-import type { EventContext, EventContextPage, MemberSummary, RoomSummary } from './types';
+import type { MemberSummary, RoomSummary } from './types';
 import type { Emote } from './emotes';
 import { formatBody } from './markdown';
 import { mentionedUserIds, type Mention } from './mentions';
@@ -50,12 +50,6 @@ export const uploadAvatar = (file: File) => transport.uploadAvatar(file);
 export const uploadRoomAvatar = (room_id: string, file: File) => transport.uploadRoomAvatar(room_id, file);
 export const uploadMedia = (file: File) => transport.uploadMedia(file);
 export const paginateRoom = (room_id: string) => transport.paginateRoom(room_id);
-export const eventContext = (room_id: string, event_id: string, limit?: number): Promise<EventContext> =>
-  transport.eventContext(room_id, event_id, limit);
-export const eventContextBefore = (room_id: string, event_id: string, from: string, limit?: number): Promise<EventContextPage> =>
-  transport.eventContextBefore(room_id, event_id, from, limit);
-export const eventContextAfter = (room_id: string, event_id: string, from: string, limit?: number): Promise<EventContextPage> =>
-  transport.eventContextAfter(room_id, event_id, from, limit);
 export const setTyping = (room_id: string, typing: boolean) => transport.setTyping(room_id, typing);
 export const getAccountData = (eventType: string) => transport.getAccountData(eventType);
 export const getUrlPreview = (room_id: string, url: string) => transport.getUrlPreview(room_id, url);

Modified file: web/src/lib/store.ts−24 deletions@@ -14,7 +14,6 @@ import {
 } from './types';
 import type {
   EncryptionState,
-  EventContext,
   ImagePacks,
   MemberSummary,
   RoomSummary,
@@ -29,12 +28,6 @@ export const blocked = writable<boolean>(false);
 export const rooms = writable<RoomSummary[]>([]);
 export const timelines = writable<Record<string, TimelineItem[]>>({});
 export const pinnedTimelines = writable<Record<string, TimelineItem[]>>({});
-export interface EventContextState {
-  room_id: string;
-  request_id: string;
-  context: EventContext;
-}
-export const eventContexts = writable<Record<string, EventContextState>>({});
 export const connection = writable<string>('connecting');
 export const selectedRoomId = writable<string | null>(null);
 export const membersByRoom = writable<Record<string, MemberSummary[]>>({});
@@ -64,7 +57,6 @@ export function resetClientState(): void {
   rooms.set([]);
   timelines.set({});
   pinnedTimelines.set({});
-  eventContexts.set({});
   connection.set('connecting');
   selectedRoomId.set(null);
   membersByRoom.set({});
@@ -77,22 +69,6 @@ export function resetClientState(): void {
   resetLinkPreviews();
 }
 
-export function setEventContext(state: EventContextState): void {
-  const key = `${state.room_id}:${state.request_id}`;
-  eventContexts.update((all) => ({ ...all, [key]: state }));
-}
-
-export function clearEventContext(roomId: string, requestId?: string): void {
-  eventContexts.update((all) => {
-    const prefix = `${roomId}:`;
-    const next = { ...all };
-    for (const key of Object.keys(next)) {
-      if (key.startsWith(prefix) && (requestId === undefined || key === `${prefix}${requestId}`)) delete next[key];
-    }
-    return next;
-  });
-}
-
 function applyTimelinePayload(roomId: string, payload: Record<string, unknown>): void {
   if (!Array.isArray(payload['items'])) return;
   const items = parseTimelineList(payload['items']);

Modified file: web/src/lib/transport-http.ts+1 additions−30 deletions@@ -1,5 +1,4 @@
-import type { EventContext, EventContextPage, MemberSummary, RoomSummary } from './types';
-import { parseEventContext, parseEventContextPage } from './types';
+import type { MemberSummary, RoomSummary } from './types';
 import { ApiError, type CommandRequest, type SendKind, type SessionInfo, type Transport, type UploadExtras, type VerifyAction } from './transport';
 
 async function parseFailure(res: Response, fallback: string): Promise<never> {
@@ -104,34 +103,6 @@ export class HttpTransport implements Transport {
   paginateRoom(room_id: string): Promise<void> {
     return this.roomCommand(ROOM_COMMAND_PATHS.paginate, { room_id });
   }
-  async eventContext(room_id: string, event_id: string, limit = 20): Promise<EventContext> {
-    const res = await fetch('/api/rooms/context', {
-      method: 'POST',
-      credentials: 'same-origin',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ room_id, event_id, limit })
-    });
-    const parsed = parseEventContext(await json<unknown>(res, 'Could not load event context'));
-    if (!parsed) throw new ApiError(502, 'Invalid event context response');
-    return parsed;
-  }
-  async eventContextBefore(room_id: string, event_id: string, from: string, limit = 20): Promise<EventContextPage> {
-    return this.eventContextPage('before', room_id, event_id, from, limit);
-  }
-  async eventContextAfter(room_id: string, event_id: string, from: string, limit = 20): Promise<EventContextPage> {
-    return this.eventContextPage('after', room_id, event_id, from, limit);
-  }
-  private async eventContextPage(direction: 'before' | 'after', room_id: string, event_id: string, from: string, limit: number): Promise<EventContextPage> {
-    const res = await fetch(`/api/rooms/context/${direction}`, {
-      method: 'POST',
-      credentials: 'same-origin',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ room_id, event_id, from, limit })
-    });
-    const parsed = parseEventContextPage(await json<unknown>(res, 'Could not load event context'));
-    if (!parsed) throw new ApiError(502, 'Invalid event context page response');
-    return parsed;
-  }
   setTyping(room_id: string, typing: boolean): Promise<void> {
     return this.roomCommand(ROOM_COMMAND_PATHS.typing, { room_id, typing });
   }

Modified file: web/src/lib/transport-worker.ts+1 additions−21 deletions@@ -1,5 +1,4 @@
-import { parseEventContext, parseEventContextPage } from './types';
-import type { EventContext, EventContextPage, MemberSummary, RoomSummary } from './types';
+import type { MemberSummary, RoomSummary } from './types';
 import { ApiError, type CommandRequest, type SendKind, type SessionInfo, type SoftLogout, type Transport, type UploadExtras, type VerifyAction } from './transport';
 import { statusForKind } from './wire-status';
 
@@ -230,25 +229,6 @@ export class WorkerTransport implements Transport {
   paginateRoom(room_id: string): Promise<void> {
     return this.client.call('paginate', { room_id });
   }
-  eventContext(room_id: string, event_id: string, limit = 20): Promise<EventContext> {
-    return this.contextCall('event_context', { room_id, event_id, limit });
-  }
-  eventContextBefore(room_id: string, event_id: string, from: string, limit = 20): Promise<EventContextPage> {
-    return this.contextPageCall('event_context_before', { room_id, event_id, from, limit });
-  }
-  eventContextAfter(room_id: string, event_id: string, from: string, limit = 20): Promise<EventContextPage> {
-    return this.contextPageCall('event_context_after', { room_id, event_id, from, limit });
-  }
-  private async contextCall(op: string, fields: Record<string, unknown>): Promise<EventContext> {
-    const parsed = parseEventContext(await this.client.call(op, fields));
-    if (!parsed) throw new ApiError(502, 'Invalid event context response');
-    return parsed;
-  }
-  private async contextPageCall(op: string, fields: Record<string, unknown>): Promise<EventContextPage> {
-    const parsed = parseEventContextPage(await this.client.call(op, fields));
-    if (!parsed) throw new ApiError(502, 'Invalid event context page response');
-    return parsed;
-  }
   setTyping(room_id: string, typing: boolean): Promise<void> {
     return this.client.call('typing', { room_id, typing });
   }

Modified file: web/src/lib/transport.ts+1 additions−4 deletions@@ -1,4 +1,4 @@
-import type { EventContext, EventContextPage, MemberSummary, PackUsage, RoomSummary } from './types';
+import type { MemberSummary, PackUsage, RoomSummary } from './types';
 
 export class ApiError extends Error {
   status: number;
@@ -98,9 +98,6 @@ export interface Transport {
     kind?: SendKind
   ): Promise<void>;
   paginateRoom(room_id: string): Promise<void>;
-  eventContext(room_id: string, event_id: string, limit?: number): Promise<EventContext>;
-  eventContextBefore(room_id: string, event_id: string, from: string, limit?: number): Promise<EventContextPage>;
-  eventContextAfter(room_id: string, event_id: string, from: string, limit?: number): Promise<EventContextPage>;
   setTyping(room_id: string, typing: boolean): Promise<void>;
   getAccountData(eventType: string): Promise<unknown | null>;
   getUrlPreview(room_id: string, url: string): Promise<unknown | null>;

Modified file: web/src/lib/types.ts−41 deletions@@ -654,23 +654,6 @@ export type TimelineItem =
   | { kind: 'start' }
   | { kind: 'unknown'; label: string };
 
-export interface EventContext {
-  events_before: TimelineItem[];
-  event: TimelineItem | null;
-  events_after: TimelineItem[];
-  start_token: string | null;
-  end_token: string | null;
-}
-
-export type EventContextDirection = 'Before' | 'After';
-
-export interface EventContextPage {
-  direction: EventContextDirection;
-  events: TimelineItem[];
-  next_token: string | null;
-  end_reached: boolean;
-}
-
 /** Normalize one TimelineItem from external-tag serde form. */
 export function parseTimelineItem(raw: unknown): TimelineItem | null {
   if (raw === 'ReadMarker') return { kind: 'readMarker' };
@@ -697,30 +680,6 @@ export function parseTimelineList(raw: unknown): TimelineItem[] {
   return out;
 }
 
-export function parseEventContext(raw: unknown): EventContext | null {
-  if (!isRecord(raw)) return null;
-  const eventRaw = raw['event'];
-  return {
-    events_before: parseTimelineList(raw['events_before']),
-    event: eventRaw == null ? null : parseTimelineItem(eventRaw),
-    events_after: parseTimelineList(raw['events_after']),
-    start_token: optionalString(raw, 'start_token'),
-    end_token: optionalString(raw, 'end_token')
-  };
-}
-
-export function parseEventContextPage(raw: unknown): EventContextPage | null {
-  if (!isRecord(raw)) return null;
-  const direction = raw['direction'];
-  if (direction !== 'Before' && direction !== 'After') return null;
-  return {
-    direction,
-    events: parseTimelineList(raw['events']),
-    next_token: optionalString(raw, 'next_token'),
-    end_reached: raw['end_reached'] === true
-  };
-}
-
 export type PackUsage = 'Emoticon' | 'Sticker';
 export interface PackImage {
   shortcode: string;

malice

Commit f7069be9f61e

Commit `f7069be9f61e`