Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

# Add graceful fail if MSC4140 event delay exceeded
1 change: 1 addition & 0 deletions src/app/cs-errorcode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}
38 changes: 35 additions & 3 deletions src/app/features/room/RoomInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
useRef,
useState,
} from 'react';
import { useAtom, useAtomValue } from 'jotai';
import { useAtom, useAtomValue, useSetAtom } from 'jotai';
import { isKeyHotkey } from 'is-hotkey';
import {
EventType,
IContent,
MatrixError,
MatrixEvent,
MsgType,
RelationType,
Expand All @@ -25,6 +26,7 @@
import { Editor, Point, Range, Transforms } from 'slate';
import {
Box,
color,
config,
Dialog,
Icon,
Expand Down Expand Up @@ -137,6 +139,7 @@
delayedEventsSupportedAtom,
roomIdToScheduledTimeAtomFamily,
roomIdToEditingScheduledDelayIdAtomFamily,
serverMaxDelayMsAtom,
} from '$state/scheduledMessages';
import {
sendDelayedMessage,
Expand All @@ -151,7 +154,8 @@
import { useRoomCreators } from '$hooks/useRoomCreators';
import { useRoomPermissions } from '$hooks/useRoomPermissions';
import { AutocompleteNotice } from '$components/editor/autocomplete/AutocompleteNotice';
import { ErrorCode } from '../../cs-errorcode';
import { getSupportedAudioExtension } from '$plugins/voice-recorder-kit/supportedCodec';

Check failure on line 158 in src/app/features/room/RoomInput.tsx

View workflow job for this annotation

GitHub Actions / Lint

`$plugins/voice-recorder-kit/supportedCodec` import should occur before import of `../../cs-errorcode`
import { SchedulePickerDialog } from './schedule-send';
import * as css from './schedule-send/SchedulePickerDialog.css';
import {
Expand Down Expand Up @@ -348,6 +352,8 @@
const [showSchedulePicker, setShowSchedulePicker] = useState(false);
const [silentReply, setSilentReply] = useState(false);
const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock');
const setServerMaxDelayMs = useSetAtom(serverMaxDelayMsAtom);
const [sendError, setSendError] = useState<string | undefined>();
const isEncrypted = room.hasEncryptionStateEvent();

useElementSizeObserver(
Expand Down Expand Up @@ -674,12 +680,21 @@
} 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 {
Expand Down Expand Up @@ -738,6 +753,8 @@
setEditingScheduledDelayId,
setScheduledTime,
room,
setServerMaxDelayMs,
setSendError,
]);

const handleKeyDown: KeyboardEventHandler = useCallback(
Expand Down Expand Up @@ -979,6 +996,7 @@
onClick={() => {
setScheduledTime(null);
setEditingScheduledDelayId(null);
setSendError(undefined);
}}
variant="SurfaceVariant"
size="300"
Expand All @@ -997,6 +1015,19 @@
</Box>
</div>
)}
{sendError && (
<div>
<Box
alignItems="Center"
gap="300"
style={{ padding: `${config.space.S200} ${config.space.S300} 0` }}
>
<Text style={{ color: color.Critical.Main }} size="T300">
{sendError}
</Text>
</Box>
</div>
)}
{replyDraft && (!threadRootId || replyDraft.body) && (
<div>
<Box
Expand Down Expand Up @@ -1336,6 +1367,7 @@
onSubmit={(date) => {
setScheduledTime(date);
setShowSchedulePicker(false);
setSendError(undefined);
}}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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<string>();
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/app/state/scheduledMessages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ export const roomIdToEditingScheduledDelayIdAtomFamily = atomFamily<
string,
ReturnType<typeof atom<string | null>>
>(() => atom<string | null>(null));

export const serverMaxDelayMsAtom = atom<number | null>(null);
Loading