From d2d002509882dbc467dad4788191c5fdbc25a343 Mon Sep 17 00:00:00 2001 From: jasonlaguidice <19523621+jasonlaguidice@users.noreply.github.com> Date: Sat, 14 Mar 2026 17:35:49 -0700 Subject: [PATCH 001/274] Add graceful fail if MSC4140 event delay exceeded --- src/app/cs-errorcode.ts | 1 + src/app/features/room/RoomInput.tsx | 38 +++++++++++++++++-- .../schedule-send/SchedulePickerDialog.tsx | 8 +++- src/app/state/scheduledMessages.ts | 2 + 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/app/cs-errorcode.ts b/src/app/cs-errorcode.ts index 6c21d670c..4e54d5ac0 100644 --- a/src/app/cs-errorcode.ts +++ b/src/app/cs-errorcode.ts @@ -34,4 +34,5 @@ export enum ErrorCode { M_EXCLUSIVE = 'M_EXCLUSIVE', M_RESOURCE_LIMIT_EXCEEDED = 'M_RESOURCE_LIMIT_EXCEEDED', M_CANNOT_LEAVE_SERVER_NOTICE_ROOM = 'M_CANNOT_LEAVE_SERVER_NOTICE_ROOM', + M_MAX_DELAY_EXCEEDED = 'M_MAX_DELAY_EXCEEDED', } diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx index b280cf5d5..0f2d7811c 100644 --- a/src/app/features/room/RoomInput.tsx +++ b/src/app/features/room/RoomInput.tsx @@ -9,11 +9,12 @@ import { useRef, useState, } from 'react'; -import { useAtom, useAtomValue } from 'jotai'; +import { useAtom, useAtomValue, useSetAtom } from 'jotai'; import { isKeyHotkey } from 'is-hotkey'; import { EventType, IContent, + MatrixError, MsgType, RelationType, Room, @@ -24,6 +25,7 @@ import { ReactEditor } from 'slate-react'; import { Editor, Point, Range, Transforms } from 'slate'; import { Box, + color, config, Dialog, Icon, @@ -135,6 +137,7 @@ import { delayedEventsSupportedAtom, roomIdToScheduledTimeAtomFamily, roomIdToEditingScheduledDelayIdAtomFamily, + serverMaxDelayMsAtom, } from '$state/scheduledMessages'; import { sendDelayedMessage, @@ -149,6 +152,7 @@ import { usePowerLevelsContext } from '$hooks/usePowerLevels'; import { useRoomCreators } from '$hooks/useRoomCreators'; import { useRoomPermissions } from '$hooks/useRoomPermissions'; import { AutocompleteNotice } from '$components/editor/autocomplete/AutocompleteNotice'; +import { ErrorCode } from '../../cs-errorcode'; import { SchedulePickerDialog } from './schedule-send'; import * as css from './schedule-send/SchedulePickerDialog.css'; import { @@ -313,6 +317,8 @@ export const RoomInput = forwardRef( const [showSchedulePicker, setShowSchedulePicker] = useState(false); const [silentReply, setSilentReply] = useState(false); const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock'); + const setServerMaxDelayMs = useSetAtom(serverMaxDelayMsAtom); + const [sendError, setSendError] = useState(); const isEncrypted = room.hasEncryptionStateEvent(); useElementSizeObserver( @@ -638,12 +644,21 @@ export const RoomInput = forwardRef( } else { await sendDelayedMessage(mx, roomId, content, delayMs); } + setSendError(undefined); invalidate(); setEditingScheduledDelayId(null); setScheduledTime(null); resetInput(); - } catch { - // Network/server error — leave editor and scheduled state intact for retry + } catch (e: unknown) { + if (e instanceof MatrixError && e.errcode === ErrorCode.M_MAX_DELAY_EXCEEDED) { + const maxDelay = (e.data as { max_delay?: number })?.max_delay; + if (typeof maxDelay === 'number') setServerMaxDelayMs(maxDelay); + setSendError( + 'Scheduled time exceeds the maximum delay allowed by this server. Please choose an earlier time.' + ); + } else { + setSendError('Failed to schedule message. Please try again.'); + } } } else if (editingScheduledDelayId) { try { @@ -702,6 +717,8 @@ export const RoomInput = forwardRef( setEditingScheduledDelayId, setScheduledTime, room, + setServerMaxDelayMs, + setSendError, ]); const handleKeyDown: KeyboardEventHandler = useCallback( @@ -943,6 +960,7 @@ export const RoomInput = forwardRef( onClick={() => { setScheduledTime(null); setEditingScheduledDelayId(null); + setSendError(undefined); }} variant="SurfaceVariant" size="300" @@ -961,6 +979,19 @@ export const RoomInput = forwardRef( )} + {sendError && ( +
+ + + {sendError} + + +
+ )} {replyDraft && (!threadRootId || replyDraft.body) && (
( onSubmit={(date) => { setScheduledTime(date); setShowSchedulePicker(false); + setSendError(undefined); }} /> )} diff --git a/src/app/features/room/schedule-send/SchedulePickerDialog.tsx b/src/app/features/room/schedule-send/SchedulePickerDialog.tsx index 50f119ef9..bb5154c72 100644 --- a/src/app/features/room/schedule-send/SchedulePickerDialog.tsx +++ b/src/app/features/room/schedule-send/SchedulePickerDialog.tsx @@ -1,4 +1,6 @@ import { MouseEventHandler, useState } from 'react'; +import { useAtomValue } from 'jotai'; +import { serverMaxDelayMsAtom } from '$state/scheduledMessages'; import FocusTrap from 'focus-trap-react'; import { Dialog, @@ -38,7 +40,9 @@ export function SchedulePickerDialog({ onSubmit, }: SchedulePickerDialogProps) { const now = Date.now(); - const maxDelay = daysToMs(30); + const serverMaxDelayMs = useAtomValue(serverMaxDelayMsAtom); + const maxDelay = serverMaxDelayMs ?? daysToMs(30); + const maxDays = Math.round(maxDelay / daysToMs(1)); const defaultTs = initialTime ?? now + hoursToMs(1); const [ts, setTs] = useState(() => Math.max(defaultTs, now + 60000)); const [error, setError] = useState(); @@ -66,7 +70,7 @@ export function SchedulePickerDialog({ return; } if (delay > maxDelay) { - setError('Cannot schedule more than 30 days in advance'); + setError(`Cannot schedule more than ${maxDays} day${maxDays !== 1 ? 's' : ''} in advance`); return; } setError(undefined); diff --git a/src/app/state/scheduledMessages.ts b/src/app/state/scheduledMessages.ts index ba28b60eb..2916a78b0 100644 --- a/src/app/state/scheduledMessages.ts +++ b/src/app/state/scheduledMessages.ts @@ -14,3 +14,5 @@ export const roomIdToEditingScheduledDelayIdAtomFamily = atomFamily< string, ReturnType> >(() => atom(null)); + +export const serverMaxDelayMsAtom = atom(null); From 349d71dfceace71ece1c53257a815312e4bd83df Mon Sep 17 00:00:00 2001 From: jasonlaguidice <19523621+jasonlaguidice@users.noreply.github.com> Date: Sat, 14 Mar 2026 17:38:02 -0700 Subject: [PATCH 002/274] Add changeset --- .../add_graceful_fail_if_msc4140_event_delay_exceeded.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/add_graceful_fail_if_msc4140_event_delay_exceeded.md diff --git a/.changeset/add_graceful_fail_if_msc4140_event_delay_exceeded.md b/.changeset/add_graceful_fail_if_msc4140_event_delay_exceeded.md new file mode 100644 index 000000000..35397e298 --- /dev/null +++ b/.changeset/add_graceful_fail_if_msc4140_event_delay_exceeded.md @@ -0,0 +1,5 @@ +--- +default: patch +--- + +# Add graceful fail if MSC4140 event delay exceeded From 02e64039f850ad39e2fad35841c49d9bf0eae3d8 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Wed, 1 Apr 2026 23:10:37 -0500 Subject: [PATCH 003/274] initial github repo theme fetching logic --- config.json | 5 ++ src/app/hooks/useClientConfig.ts | 3 ++ src/app/state/settings.ts | 16 +++++++ src/app/theme/cache.ts | 54 ++++++++++++++++++++++ src/app/theme/catalog.test.ts | 72 +++++++++++++++++++++++++++++ src/app/theme/catalog.ts | 63 +++++++++++++++++++++++++ src/app/theme/githubRaw.ts | 27 +++++++++++ src/app/theme/index.ts | 7 +++ src/app/theme/legacyThemeMap.ts | 23 ++++++++++ src/app/theme/metadata.ts | 79 ++++++++++++++++++++++++++++++++ src/app/theme/previewCss.ts | 36 +++++++++++++++ src/app/theme/themeUrlGuards.ts | 14 ++++++ 12 files changed, 399 insertions(+) create mode 100644 src/app/theme/cache.ts create mode 100644 src/app/theme/catalog.test.ts create mode 100644 src/app/theme/catalog.ts create mode 100644 src/app/theme/githubRaw.ts create mode 100644 src/app/theme/index.ts create mode 100644 src/app/theme/legacyThemeMap.ts create mode 100644 src/app/theme/metadata.ts create mode 100644 src/app/theme/previewCss.ts create mode 100644 src/app/theme/themeUrlGuards.ts diff --git a/config.json b/config.json index f0c3c8b61..0767b7837 100644 --- a/config.json +++ b/config.json @@ -15,6 +15,11 @@ "settingsLinkBaseUrl": "https://app.sable.moe", + "themeCatalogBaseUrl": "https://raw.githubusercontent.com/SableClient/themes/main/", + "themeCatalogApprovedHostPrefixes": [ + "https://raw.githubusercontent.com/SableClient/themes/" + ], + "slidingSync": { "enabled": true }, diff --git a/src/app/hooks/useClientConfig.ts b/src/app/hooks/useClientConfig.ts index e523f15a7..4ae806ff6 100644 --- a/src/app/hooks/useClientConfig.ts +++ b/src/app/hooks/useClientConfig.ts @@ -43,6 +43,9 @@ export type ClientConfig = { matrixToBaseUrl?: string; settingsLinkBaseUrl?: string; + + themeCatalogBaseUrl?: string; + themeCatalogApprovedHostPrefixes?: string[]; }; const ClientConfigContext = createContext(null); diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts index 8a4956394..906c298e2 100644 --- a/src/app/state/settings.ts +++ b/src/app/state/settings.ts @@ -121,6 +121,14 @@ export interface Settings { // furry stuff renderAnimals: boolean; + + // theme catalog + themeRemoteCatalogEnabled: boolean; + themeChatPreviewAnyUrl: boolean; + themeChatPreviewApprovedCatalogOnly: boolean; + themeRemoteManualFullUrl?: string; + themeRemoteLightFullUrl?: string; + themeRemoteDarkFullUrl?: string; } const defaultSettings: Settings = { @@ -219,6 +227,14 @@ const defaultSettings: Settings = { // furry stuff renderAnimals: true, + + // theme catalog + themeRemoteCatalogEnabled: false, + themeChatPreviewAnyUrl: false, + themeChatPreviewApprovedCatalogOnly: false, + themeRemoteManualFullUrl: undefined, + themeRemoteLightFullUrl: undefined, + themeRemoteDarkFullUrl: undefined, }; export const getSettings = () => { diff --git a/src/app/theme/cache.ts b/src/app/theme/cache.ts new file mode 100644 index 000000000..7517e9c4d --- /dev/null +++ b/src/app/theme/cache.ts @@ -0,0 +1,54 @@ +const DB_NAME = 'sable-theme-cache'; +const DB_VERSION = 1; +const STORE = 'themes'; + +export type CachedThemeEntry = { + url: string; + cssText: string; + cachedAt: number; +}; + +function openDb(): Promise { + return new Promise((resolve, reject) => { + const req = indexedDB.open(DB_NAME, DB_VERSION); + req.onerror = () => reject(req.error); + req.onsuccess = () => resolve(req.result); + req.onupgradeneeded = () => { + req.result.createObjectStore(STORE, { keyPath: 'url' }); + }; + }); +} + +export async function getCachedThemeCss(url: string): Promise { + const db = await openDb(); + return new Promise((resolve, reject) => { + const tx = db.transaction(STORE, 'readonly'); + const req = tx.objectStore(STORE).get(url); + req.onerror = () => reject(req.error); + req.onsuccess = () => { + const row = req.result as CachedThemeEntry | undefined; + resolve(row?.cssText); + }; + }); +} + +export async function putCachedThemeCss(url: string, cssText: string): Promise { + const db = await openDb(); + const entry: CachedThemeEntry = { url, cssText, cachedAt: Date.now() }; + return new Promise((resolve, reject) => { + const tx = db.transaction(STORE, 'readwrite'); + tx.objectStore(STORE).put(entry); + tx.oncomplete = () => resolve(); + tx.onerror = () => reject(tx.error); + }); +} + +export async function clearThemeCache(): Promise { + const db = await openDb(); + return new Promise((resolve, reject) => { + const tx = db.transaction(STORE, 'readwrite'); + tx.objectStore(STORE).clear(); + tx.oncomplete = () => resolve(); + tx.onerror = () => reject(tx.error); + }); +} diff --git a/src/app/theme/catalog.test.ts b/src/app/theme/catalog.test.ts new file mode 100644 index 000000000..c5998962f --- /dev/null +++ b/src/app/theme/catalog.test.ts @@ -0,0 +1,72 @@ +import { afterEach, describe, expect, it, vi } from 'vitest'; +import { listThemePairsFromCatalog } from './catalog'; + +describe('listThemePairsFromCatalog', () => { + const origFetch = globalThis.fetch; + + afterEach(() => { + globalThis.fetch = origFetch; + }); + + it('pairs preview and full theme files from GitHub contents response', async () => { + globalThis.fetch = vi.fn().mockResolvedValue({ + ok: true, + json: async () => [ + { + name: 'rose-pine.preview.sable.css', + path: 'rose-pine.preview.sable.css', + type: 'file', + download_url: 'https://raw.githubusercontent.com/SableClient/themes/main/rose-pine.preview.sable.css', + }, + { + name: 'rose-pine.sable.css', + path: 'rose-pine.sable.css', + type: 'file', + download_url: 'https://raw.githubusercontent.com/SableClient/themes/main/rose-pine.sable.css', + }, + { + name: 'README.md', + path: 'README.md', + type: 'file', + download_url: null, + }, + ], + }); + + const base = 'https://raw.githubusercontent.com/SableClient/themes/main/'; + const pairs = await listThemePairsFromCatalog(base); + + expect(pairs).toHaveLength(1); + expect(pairs[0].basename).toBe('rose-pine'); + expect(pairs[0].fullUrl).toContain('rose-pine.sable.css'); + expect(pairs[0].previewUrl).toContain('rose-pine.preview.sable.css'); + + expect(globalThis.fetch).toHaveBeenCalledWith( + 'https://api.github.com/repos/SableClient/themes/contents?ref=main', + expect.objectContaining({ headers: { Accept: 'application/vnd.github+json' } }) + ); + }); + + it('requests nested directory when catalog URL includes a path', async () => { + globalThis.fetch = vi.fn().mockResolvedValue({ + ok: true, + json: async () => [], + }); + + await listThemePairsFromCatalog( + 'https://raw.githubusercontent.com/SableClient/themes/main/dist/themes/' + ); + + expect(globalThis.fetch).toHaveBeenCalledWith( + 'https://api.github.com/repos/SableClient/themes/contents/dist/themes?ref=main', + expect.anything() + ); + }); + + it('returns empty array when base URL is not a raw GitHub URL', async () => { + globalThis.fetch = vi.fn(); + const pairs = await listThemePairsFromCatalog('https://example.com/'); + expect(pairs).toEqual([]); + expect(globalThis.fetch).not.toHaveBeenCalled(); + }); +}); diff --git a/src/app/theme/catalog.ts b/src/app/theme/catalog.ts new file mode 100644 index 000000000..44efaf558 --- /dev/null +++ b/src/app/theme/catalog.ts @@ -0,0 +1,63 @@ +import { parseGithubRawBaseUrl, rawFileUrl, type GithubRawParts } from './githubRaw'; + +export type GithubContentItem = { + name: string; + path: string; + type: 'file' | 'dir'; + download_url: string | null; +}; + +export type ThemePair = { + basename: string; + previewUrl: string; + fullUrl: string; +}; + +const PREVIEW_SUFFIX = '.preview.sable.css'; +const FULL_SUFFIX = '.sable.css'; + +export async function listThemePairsFromCatalog(baseUrl: string): Promise { + const parts = parseGithubRawBaseUrl(baseUrl); + if (!parts) return []; + const items = await fetchGithubContents(parts); + const previewFiles = items.filter( + (i) => i.type === 'file' && i.name.endsWith(PREVIEW_SUFFIX) + ); + const pairs: ThemePair[] = []; + for (const p of previewFiles) { + const basename = p.name.slice(0, -PREVIEW_SUFFIX.length); + const fullName = `${basename}${FULL_SUFFIX}`; + const full = items.find((i) => i.type === 'file' && i.name === fullName); + if (!full?.download_url) continue; + pairs.push({ + basename, + previewUrl: rawFileUrl(parts, p.name), + fullUrl: full.download_url, + }); + } + return pairs; +} + +/** Path segments for GET /repos/.../contents/{path} */ +function directoryPathToApiSegment(directoryPath: string): string { + if (!directoryPath) return ''; + return directoryPath + .split('/') + .filter(Boolean) + .map((seg) => encodeURIComponent(seg)) + .join('/'); +} + +async function fetchGithubContents(parts: GithubRawParts): Promise { + const encoded = directoryPathToApiSegment(parts.directoryPath); + const pathSeg = encoded ? `/${encoded}` : ''; + const apiUrl = `https://api.github.com/repos/${parts.owner}/${parts.repo}/contents${pathSeg}?ref=${encodeURIComponent(parts.ref)}`; + const res = await fetch(apiUrl, { + headers: { Accept: 'application/vnd.github+json' }, + }); + if (!res.ok) { + throw new Error(`theme catalog list failed: ${res.status}`); + } + const data = (await res.json()) as GithubContentItem | GithubContentItem[]; + return Array.isArray(data) ? data : [data]; +} diff --git a/src/app/theme/githubRaw.ts b/src/app/theme/githubRaw.ts new file mode 100644 index 000000000..978e3bd20 --- /dev/null +++ b/src/app/theme/githubRaw.ts @@ -0,0 +1,27 @@ +/** + * Parse a raw.githubusercontent.com base URL into API parameters. + * E.g. https://raw.githubusercontent.com/SableClient/themes/main/themes/ + */ +export type GithubRawParts = { + owner: string; + repo: string; + ref: string; + directoryPath: string; +}; + +const RAW_RE = + /^https:\/\/raw\.githubusercontent\.com\/([^/]+)\/([^/]+)\/([^/]+)(?:\/(.*))?$/; + +export function parseGithubRawBaseUrl(baseUrl: string): GithubRawParts | null { + const trimmed = baseUrl.trim().replace(/\/+$/, ''); + const m = trimmed.match(RAW_RE); + if (!m) return null; + const [, owner, repo, ref, rest] = m; + const directoryPath = (rest ?? '').replace(/^\/+|\/+$/g, ''); + return { owner, repo, ref, directoryPath }; +} + +export function rawFileUrl(parts: GithubRawParts, fileName: string): string { + const dir = parts.directoryPath ? `${parts.directoryPath}/` : ''; + return `https://raw.githubusercontent.com/${parts.owner}/${parts.repo}/${parts.ref}/${dir}${fileName}`; +} diff --git a/src/app/theme/index.ts b/src/app/theme/index.ts new file mode 100644 index 000000000..59c11d7a8 --- /dev/null +++ b/src/app/theme/index.ts @@ -0,0 +1,7 @@ +export * from './cache'; +export * from './catalog'; +export * from './githubRaw'; +export * from './legacyThemeMap'; +export * from './metadata'; +export * from './previewCss'; +export * from './themeUrlGuards'; diff --git a/src/app/theme/legacyThemeMap.ts b/src/app/theme/legacyThemeMap.ts new file mode 100644 index 000000000..824e0083e --- /dev/null +++ b/src/app/theme/legacyThemeMap.ts @@ -0,0 +1,23 @@ +/** + * Map legacy theme ids to catalog basenames (SableClient/themes repo filenames without suffix) for migration. + */ +export const LEGACY_THEME_TO_BASENAME: Record = { + 'silver-theme': 'silver', + 'cinny-light-theme': 'cinny-light', + 'cinny-silver-theme': 'cinny-silver', + 'dark-theme': 'dark', + 'light-theme': 'light', + 'butter-theme': 'butter', + 'rose-pine-theme': 'rose-pine', + 'cinny-dark-theme': 'cinny-dark', + 'gruvdark-theme': 'gruvdark', + 'accord-theme': 'accord', + 'black-theme': 'black', +}; + +export const LEGACY_THEME_IDS = Object.keys(LEGACY_THEME_TO_BASENAME); + +export function isLegacyBuiltinThemeId(id: string | undefined): boolean { + if (!id) return false; + return id !== 'light-theme' && id !== 'dark-theme' && id in LEGACY_THEME_TO_BASENAME; +} diff --git a/src/app/theme/metadata.ts b/src/app/theme/metadata.ts new file mode 100644 index 000000000..2220ad58e --- /dev/null +++ b/src/app/theme/metadata.ts @@ -0,0 +1,79 @@ +import { ThemeKind } from '$hooks/useTheme'; + +export type SableThemeContrast = 'low' | 'high'; + +export type SableThemeMetadata = { + id: string; + name: string; + kind: ThemeKind; + contrast: SableThemeContrast; + tags: string[]; + legacyIds: string[]; + fullThemeUrl?: string; +}; + +const META_START = '@sable-theme'; + +/** + * First block comment must contain @sable-theme and key: value lines. + */ +export function parseSableThemeMetadata(cssText: string): Partial { + const block = extractFirstBlockComment(cssText); + if (!block.includes(META_START)) return {}; + + const lines = block.split(/\r?\n/).map((l) => l.replace(/^\s*\*?\s?/, '').trim()); + const out: Partial = {}; + for (const line of lines) { + if (line.startsWith('@') || line === '---' || line === '') continue; + const idx = line.indexOf(':'); + if (idx === -1) continue; + const key = line.slice(0, idx).trim().toLowerCase(); + const value = line.slice(idx + 1).trim(); + switch (key) { + case 'id': + out.id = value; + break; + case 'name': + out.name = value; + break; + case 'kind': + out.kind = value === 'dark' ? ThemeKind.Dark : ThemeKind.Light; + break; + case 'contrast': + out.contrast = value === 'high' ? 'high' : 'low'; + break; + case 'tags': + out.tags = value.split(',').map((t) => t.trim()).filter(Boolean); + break; + case 'legacyids': + case 'legacy_ids': + out.legacyIds = value.split(',').map((t) => t.trim()).filter(Boolean); + break; + case 'fullthemeurl': + case 'full_theme_url': + out.fullThemeUrl = value; + break; + default: + break; + } + } + return out; +} + +function extractFirstBlockComment(cssText: string): string { + const start = cssText.indexOf('/*'); + if (start === -1) return ''; + const end = cssText.indexOf('*/', start + 2); + if (end === -1) return ''; + return cssText.slice(start + 2, end); +} + +export function extractFullThemeUrlFromPreview(cssText: string): string | undefined { + const meta = parseSableThemeMetadata(cssText); + if (meta.fullThemeUrl && /^https:\/\//i.test(meta.fullThemeUrl)) { + return meta.fullThemeUrl; + } + const block = extractFirstBlockComment(cssText); + const m = block.match(/fullThemeUrl:\s*(https:\/\/[^\s*]+)/i); + return m?.[1]; +} diff --git a/src/app/theme/previewCss.ts b/src/app/theme/previewCss.ts new file mode 100644 index 000000000..79f33bd8f --- /dev/null +++ b/src/app/theme/previewCss.ts @@ -0,0 +1,36 @@ +/** + * Build safe preview CSS from a `.preview.sable.css` file: only allow --sable-* / --tc-* custom properties. + * Raw preview text is never injected as a stylesheet. + */ + +const PROP_RE = /^\s*(--(?:sable|tc)-[a-zA-Z0-9-]+)\s*:\s*([^;]+?)\s*;?\s*$/; + +const DANGEROUS_VALUE = /url\s*\(|@import|expression\s*\(|javascript:|\\0||