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
5 changes: 5 additions & 0 deletions .changeset/fix-missing-scheduled-message-chip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

Fix the scheduled-messages chip not appearing in a room despite having pending scheduled messages.
12 changes: 8 additions & 4 deletions src/app/features/room/schedule-send/ScheduledMessagesList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -32,7 +36,7 @@ type ScheduledMessagesListProps = {
onEditMessage?: (body: string, formattedBody?: string) => void;
};

type ScheduledEvent = NonNullable<DelayedEventInfo['scheduled']>[number];
type ScheduledEvent = DelayedEventsResponse['delayed_events'][number];

type ScheduledMessageRowProps = {
room: Room;
Expand Down Expand Up @@ -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')
Expand Down
15 changes: 12 additions & 3 deletions src/app/utils/delayedEvents.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EventType, MatrixEvent, UpdateDelayedEventAction } from '$types/matrix-sdk';
import type {
DelayedEventInfo,
DelayedEventInfoItem,
SendDelayedEventResponse,
IContent,
MatrixClient,
Expand All @@ -14,6 +14,15 @@ interface EncryptableBackend {
encryptEvent(event: MatrixEvent, room: Room): Promise<void>;
}

// 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<boolean> {
try {
return await mx.doesServerSupportUnstableFeature('org.matrix.msc4140');
Expand Down Expand Up @@ -87,8 +96,8 @@ export async function sendDelayedMessageE2EE(
);
}

export async function getDelayedEvents(mx: MatrixClient): Promise<DelayedEventInfo> {
return mx._unstable_getDelayedEvents();
export async function getDelayedEvents(mx: MatrixClient): Promise<DelayedEventsResponse> {
return mx._unstable_getDelayedEvents() as unknown as Promise<DelayedEventsResponse>;
}

export async function cancelDelayedEvent(mx: MatrixClient, delayId: string): Promise<void> {
Expand Down
Loading