Skip to content
Merged
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',
}
46 changes: 42 additions & 4 deletions src/app/features/room/RoomInput.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { KeyboardEventHandler, MouseEvent, RefObject } from 'react';
import { forwardRef, useCallback, useEffect, useRef, useState, useMemo } from 'react';
import { useAtom, useAtomValue } from 'jotai';
import { useAtom, useAtomValue, useSetAtom } from 'jotai';

import { isKeyHotkey } from 'is-hotkey';
import type {
IContent,
Expand All @@ -10,6 +11,7 @@ import type {
RoomMessageEventContent,
StickerEventContent,
} from '$types/matrix-sdk';
import { MatrixError } from '$types/matrix-sdk';
import { EventType, MsgType, RelationType } from '$types/matrix-sdk';
import { ReactEditor } from 'slate-react';
import { Editor, Point, Range, Transforms } from 'slate';
Expand Down Expand Up @@ -108,14 +110,15 @@ import {
delayedEventsSupportedAtom,
roomIdToScheduledTimeAtomFamily,
roomIdToEditingScheduledDelayIdAtomFamily,
serverMaxDelayMsAtom,
} from '$state/scheduledMessages';
import {
sendDelayedMessage,
sendDelayedMessageE2EE,
computeDelayMs,
cancelDelayedEvent,
} from '$utils/delayedEvents';
import { timeHourMinute, timeDayMonthYear } from '$utils/time';
import { timeHourMinute, timeDayMonthYear, daysToMs } from '$utils/time';
import { stopPropagation } from '$utils/keyboard';

import { usePowerLevelsContext } from '$hooks/usePowerLevels';
Expand All @@ -128,6 +131,7 @@ import {
} from '$hooks/usePerMessageProfile';
import { Microphone, Stop } from '@phosphor-icons/react';
import { getSupportedAudioExtension } from '$plugins/voice-recorder-kit/supportedCodec';
import { ErrorCode } from '../../cs-errorcode';
import { sanitizeText } from '$utils/sanitize';
import { PKitCommandMessageHandler } from '$plugins/pluralkit-handler/PKitCommandMessageHandler';
import { PKitProxyMessageHandler } from '$plugins/pluralkit-handler/PKitProxyMessageHandler';
Expand Down Expand Up @@ -381,6 +385,8 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
const [showSchedulePicker, setShowSchedulePicker] = useState(false);
const [silentReply, setSilentReply] = useState(!mentionInReplies);
const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock');
const setServerMaxDelayMs = useSetAtom(serverMaxDelayMsAtom);
const [sendError, setSendError] = useState<string | undefined>();
const isEncrypted = room.hasEncryptionStateEvent();

useElementSizeObserver(
Expand Down Expand Up @@ -959,12 +965,28 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
} else {
await sendDelayedMessage(mx, roomId, content as RoomMessageEventContent, 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 ||
e.data?.['org.matrix.msc4140.errcode'] === 'M_MAX_DELAY_EXCEEDED')
) {
const maxDelay =
(e.data as { max_delay?: number })?.max_delay ??
e.data?.['org.matrix.msc4140.max_delay'];
if (typeof maxDelay === 'number') setServerMaxDelayMs(maxDelay);
const maxDelayDays = maxDelay / daysToMs(1);
setSendError(
`Scheduled time exceeds the maximum delay allowed by this server. Please choose an earlier time. The Maximum Delay is of ${maxDelayDays} day${maxDelayDays > 1 ? 's' : ''}.`
);
} else {
setSendError('Failed to schedule message. Please try again.');
}
}
} else if (editingScheduledDelayId) {
try {
Expand Down Expand Up @@ -1055,6 +1077,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
isEncrypted,
setEditingScheduledDelayId,
setScheduledTime,
setServerMaxDelayMs,
]);

const handleKeyDown: KeyboardEventHandler = useCallback(
Expand Down Expand Up @@ -1385,6 +1408,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
onClick={() => {
setScheduledTime(null);
setEditingScheduledDelayId(null);
setSendError(undefined);
}}
variant="SurfaceVariant"
size="300"
Expand All @@ -1403,6 +1427,19 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
</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 @@ -1726,6 +1763,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
onSubmit={(date) => {
setScheduledTime(date);
setShowSchedulePicker(false);
setSendError(undefined);
}}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { MouseEventHandler } from 'react';
import { useState } from 'react';
import { useAtomValue } from 'jotai';
import { serverMaxDelayMsAtom } from '$state/scheduledMessages';
import FocusTrap from 'focus-trap-react';
import type { RectCords } from 'folds';
import {
Expand Down Expand Up @@ -39,7 +41,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 @@ -67,7 +71,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