diff --git a/.github/workflows/changelog-label.yml b/.github/workflows/changelog-label.yml index d8a82832..8d9acbc2 100644 --- a/.github/workflows/changelog-label.yml +++ b/.github/workflows/changelog-label.yml @@ -9,6 +9,6 @@ jobs: steps: - uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # 2.2.2 with: - REQUIRED_LABELS_ANY: "PR-Bug-Fix,PR-Documentation,PR-Task,PR-Feature,PR-Improvement,PR-Developer-Experience,dependencies" + REQUIRED_LABELS_ANY: "PR-Bug-Fix,PR-Documentation,PR-Task,PR-Feature,PR-Improvement,PR-Developer-Experience,dependencies,PR-Breaking-Change" REQUIRED_LABELS_ANY_DESCRIPTION: "Select at least one 'PR-' label" BANNED_LABELS: "banned" diff --git a/src/config/ConfigOptions.ts b/src/config/ConfigOptions.ts index 75bd7cbb..40b2342b 100644 --- a/src/config/ConfigOptions.ts +++ b/src/config/ConfigOptions.ts @@ -114,16 +114,12 @@ export interface ConfigOptions { * when someone leaves a call. */ wait_for_key_rotation_ms?: number; - /** @deprecated use wait_for_key_rotation_ms instead */ - key_rotation_on_leave_delay?: number; /** * The duration (in milliseconds) after the most recent keep-alive (delayed leave event restart) * that the server waits before sending the leave MatrixRTC membership event. */ delayed_leave_event_delay_ms?: number; - /** @deprecated use delayed_leave_event_delay_ms instead */ - membership_server_side_expiry_timeout?: number; /** * The time (in milliseconds) after which a we consider a delayed event restart http request to have failed. @@ -141,8 +137,6 @@ export interface ConfigOptions { * messages to the server by restarting the timer for the delayed leave event. */ delayed_leave_event_restart_ms?: number; - /** @deprecated use delayed_leave_event_restart_ms instead */ - membership_keep_alive_period?: number; /** * How long we wait before retrying after a network error on any of the requests. diff --git a/src/rtcSessionHelpers.ts b/src/rtcSessionHelpers.ts index a193b8e5..be5eedf1 100644 --- a/src/rtcSessionHelpers.ts +++ b/src/rtcSessionHelpers.ts @@ -123,17 +123,13 @@ export async function enterRTCSession( useLegacyMemberEvents: !useDeviceSessionMemberEvents, }), delayedLeaveEventRestartMs: - matrixRtcSessionConfig?.delayed_leave_event_restart_ms ?? - matrixRtcSessionConfig?.membership_keep_alive_period, + matrixRtcSessionConfig?.delayed_leave_event_restart_ms, delayedLeaveEventDelayMs: - matrixRtcSessionConfig?.delayed_leave_event_delay_ms ?? - matrixRtcSessionConfig?.membership_server_side_expiry_timeout, + matrixRtcSessionConfig?.delayed_leave_event_delay_ms, delayedLeaveEventRestartLocalTimeoutMs: matrixRtcSessionConfig?.delayed_leave_event_restart_local_timeout_ms, networkErrorRetryMs: matrixRtcSessionConfig?.network_error_retry_ms, - makeKeyDelay: - matrixRtcSessionConfig?.wait_for_key_rotation_ms ?? - matrixRtcSessionConfig?.key_rotation_on_leave_delay, + makeKeyDelay: matrixRtcSessionConfig?.wait_for_key_rotation_ms, membershipEventExpiryMs: matrixRtcSessionConfig?.membership_event_expiry_ms, useExperimentalToDeviceTransport,