Skip to content

Commit c77db51

Browse files
committed
review
1 parent 5826adb commit c77db51

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

spec/unit/matrixrtc/MembershipManager.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ describe.each([
147147
const waitForSendState = waitForMockCall(client.sendStateEvent);
148148
const waitForUpdateDelaye = waitForMockCallOnce(
149149
client._unstable_updateDelayedEvent,
150-
Promise.reject(new MatrixError({ errcode: "M_NOT_FOUND" }, 429, undefined)),
150+
Promise.reject(new MatrixError({ errcode: "M_NOT_FOUND" })),
151151
);
152152
memberManager.join([focus], focusActive);
153153
await waitForSendState;

src/matrixrtc/NewMembershipManager.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,13 +439,14 @@ export class MembershipManager
439439
this.resetRateLimitCounter(MembershipActionType.SendDelayedEvent);
440440
this.state.delayId = response.delay_id;
441441
if (this.state.hasMemberStateEvent) {
442-
// Delayed event got send because it got lost due to state event auto cancel
442+
// This action was scheduled because the previous delayed event was cancelled
443+
// due to lack of https://github.com/element-hq/synapse/pull/17810
443444
return createInsertActionUpdate(
444445
MembershipActionType.RestartDelayedEvent,
445446
this.membershipKeepAlivePeriod,
446447
);
447448
} else {
448-
// Delayed event got send because we just joined
449+
// This action was scheduled because we are in the process of joining
449450
return createInsertActionUpdate(MembershipActionType.SendJoinEvent);
450451
}
451452
})
@@ -458,13 +459,14 @@ export class MembershipManager
458459
if (update) return update;
459460

460461
if (this.state.hasMemberStateEvent) {
461-
// Delayed event got send because it got lost due to state event auto cancel
462+
// This action was scheduled because the previous delayed event was cancelled
463+
// due to lack of https://github.com/element-hq/synapse/pull/17810
462464

463465
// Don't do any other delayed event work if its not supported.
464466
if (this.isUnsupportedDelayedEndpoint(e)) return {};
465467
throw Error("Could not send delayed event, even though delayed events are supported. " + e);
466468
} else {
467-
// Delayed event got send because we just joined
469+
// This action was scheduled because we are in the process of joining
468470
// log and fall through
469471
if (this.isUnsupportedDelayedEndpoint(e)) {
470472
logger.info("Not using delayed event because the endpoint is not supported");

0 commit comments

Comments
 (0)