Skip to content

MSC4140: remove parent delay IDs #5199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
AndrewFerr wants to merge 2 commits into
base: vNext
Choose a base branch
from
Draft

MSC4140: remove parent delay IDs #5199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33dc828
MSC4140: remove parent delay IDs
AndrewFerr Feb 20, 2026
1e1e433
Run prettier
AndrewFerr Feb 20, 2026
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
69 changes: 4 additions & 65 deletions spec/unit/embedded.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,12 @@ class MockWidgetApi extends EventEmitter {
public requestCapabilityToReceiveState = vi.fn().mockResolvedValue(undefined);
public requestCapabilityToSendToDevice = vi.fn().mockResolvedValue(undefined);
public requestCapabilityToReceiveToDevice = vi.fn().mockResolvedValue(undefined);
public sendRoomEvent = vi.fn(
async (eventType: string, content: unknown, roomId?: string, delay?: number, parentDelayId?: string) =>
delay === undefined && parentDelayId === undefined
? { event_id: `$${Math.random()}` }
: { delay_id: `id-${Math.random()}` },
public sendRoomEvent = vi.fn(async (eventType: string, content: unknown, roomId?: string, delay?: number) =>
delay === undefined ? { event_id: `$${Math.random()}` } : { delay_id: `id-${Math.random()}` },
);
public sendStateEvent = vi.fn(
async (
eventType: string,
stateKey: string,
content: unknown,
roomId?: string,
delay?: number,
parentDelayId?: string,
) =>
delay === undefined && parentDelayId === undefined
? { event_id: `$${Math.random()}` }
: { delay_id: `id-${Math.random()}` },
async (eventType: string, stateKey: string, content: unknown, roomId?: string, delay?: number) =>
delay === undefined ? { event_id: `$${Math.random()}` } : { delay_id: `id-${Math.random()}` },
);
public cancelScheduledDelayedEvent = vi.fn().mockResolvedValue(undefined);
public restartScheduledDelayedEvent = vi.fn().mockResolvedValue(undefined);
Expand Down Expand Up @@ -178,7 +166,6 @@ describe("RoomWidgetClient", () => {
"!1:example.org",
undefined,
undefined,
undefined,
);
});

Expand Down Expand Up @@ -434,28 +421,6 @@ describe("RoomWidgetClient", () => {
"!1:example.org",
2000,
undefined,
undefined,
);
});

it("sends child action delayed message events", async () => {
await makeClient({ sendDelayedEvents: true, sendEvent: ["org.matrix.rageshake_request"] });
expect(widgetApi.requestCapability).toHaveBeenCalledWith(MatrixCapabilities.MSC4157SendDelayedEvent);
const parentDelayId = `id-${Math.random()}`;
await client._unstable_sendDelayedEvent(
"!1:example.org",
{ parent_delay_id: parentDelayId },
null,
"org.matrix.rageshake_request",
{ request_id: 123 },
);
expect(widgetApi.sendRoomEvent).toHaveBeenCalledWith(
"org.matrix.rageshake_request",
{ request_id: 123 },
"!1:example.org",
undefined,
parentDelayId,
undefined,
);
});

Expand All @@ -478,31 +443,6 @@ describe("RoomWidgetClient", () => {
{ hello: "world" },
"!1:example.org",
2000,
undefined,
);
});

it("sends child action delayed state events", async () => {
await makeClient({
sendDelayedEvents: true,
sendState: [{ eventType: "org.example.foo", stateKey: "bar" }],
});
expect(widgetApi.requestCapability).toHaveBeenCalledWith(MatrixCapabilities.MSC4157SendDelayedEvent);
const parentDelayId = `fg-${Math.random()}`;
await client._unstable_sendDelayedStateEvent(
"!1:example.org",
{ parent_delay_id: parentDelayId },
"org.example.foo",
{ hello: "world" },
"bar",
);
expect(widgetApi.sendStateEvent).toHaveBeenCalledWith(
"org.example.foo",
"bar",
{ hello: "world" },
"!1:example.org",
undefined,
parentDelayId,
);
});

Expand Down Expand Up @@ -910,7 +850,6 @@ describe("RoomWidgetClient", () => {
{ msc4354_sticky_key: "test" },
"!1:example.org",
undefined,
undefined,
2000,
);
});
Expand Down
Loading
Loading