diff --git a/.changeset/fix-missing-scheduled-message-chip.md b/.changeset/fix-missing-scheduled-message-chip.md new file mode 100644 index 000000000..5ff513dba --- /dev/null +++ b/.changeset/fix-missing-scheduled-message-chip.md @@ -0,0 +1,5 @@ +--- +default: patch +--- + +Fix the scheduled-messages chip not appearing in a room despite having pending scheduled messages. diff --git a/src/app/features/room/schedule-send/ScheduledMessagesList.tsx b/src/app/features/room/schedule-send/ScheduledMessagesList.tsx index 8b067ae09..5ddc1bf8e 100644 --- a/src/app/features/room/schedule-send/ScheduledMessagesList.tsx +++ b/src/app/features/room/schedule-send/ScheduledMessagesList.tsx @@ -10,11 +10,15 @@ import { PencilSimple, X, } from '$components/icons/phosphor'; -import type { DelayedEventInfo, Room } from '$types/matrix-sdk'; +import type { Room } from '$types/matrix-sdk'; import { MatrixEvent } from '$types/matrix-sdk'; import { useAtom, useAtomValue, useSetAtom } from 'jotai'; import { useMatrixClient } from '$hooks/useMatrixClient'; -import { getDelayedEvents, cancelDelayedEvent } from '$utils/delayedEvents'; +import { + getDelayedEvents, + cancelDelayedEvent, + type DelayedEventsResponse, +} from '$utils/delayedEvents'; import { delayedEventsSupportedAtom, roomIdToScheduledTimeAtomFamily, @@ -32,7 +36,7 @@ type ScheduledMessagesListProps = { onEditMessage?: (body: string, formattedBody?: string) => void; }; -type ScheduledEvent = NonNullable[number]; +type ScheduledEvent = DelayedEventsResponse['delayed_events'][number]; type ScheduledMessageRowProps = { room: Room; @@ -150,7 +154,7 @@ export function ScheduledMessagesList({ room, onEditMessage }: ScheduledMessages enabled: supported, }); - const roomEvents = data?.scheduled?.filter( + const roomEvents = data?.delayed_events.filter( (event) => event.room_id === room.roomId && (event.type === 'm.room.message' || event.type === 'm.room.encrypted') diff --git a/src/app/utils/delayedEvents.ts b/src/app/utils/delayedEvents.ts index dba795ae4..e63deaf77 100644 --- a/src/app/utils/delayedEvents.ts +++ b/src/app/utils/delayedEvents.ts @@ -1,6 +1,6 @@ import { EventType, MatrixEvent, UpdateDelayedEventAction } from '$types/matrix-sdk'; import type { - DelayedEventInfo, + DelayedEventInfoItem, SendDelayedEventResponse, IContent, MatrixClient, @@ -14,6 +14,15 @@ interface EncryptableBackend { encryptEvent(event: MatrixEvent, room: Room): Promise; } +// matrix-js-sdk's own `DelayedEventInfo` type declares this array under `scheduled`, but its +// `_unstable_getDelayedEvents` call is a raw passthrough of the server's response, and MSC4140 +// (and every homeserver implementing it) puts the array under `delayed_events`: +// https://github.com/matrix-org/matrix-spec-proposals/blob/main/proposals/4140-delayed-events-futures.md +export type DelayedEventsResponse = { + delayed_events: DelayedEventInfoItem[]; + next_batch?: string; +}; + export async function supportsDelayedEvents(mx: MatrixClient): Promise { try { return await mx.doesServerSupportUnstableFeature('org.matrix.msc4140'); @@ -87,8 +96,8 @@ export async function sendDelayedMessageE2EE( ); } -export async function getDelayedEvents(mx: MatrixClient): Promise { - return mx._unstable_getDelayedEvents(); +export async function getDelayedEvents(mx: MatrixClient): Promise { + return mx._unstable_getDelayedEvents() as unknown as Promise; } export async function cancelDelayedEvent(mx: MatrixClient, delayId: string): Promise {