Skip to content

Fix for sticky event duration resets on page refresh #5432

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

Open
crime-think wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix for sticky event duration resets on page refresh #5432

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87a966a
Prevents uncontrolled sticky revival (#5206)
crime-think Jul 17, 2026
1798c56
linted
crime-think Jul 17, 2026
51815e9
Merge branch 'develop' into sticky-branch
crime-think Jul 17, 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
11 changes: 9 additions & 2 deletions src/models/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export interface IUnsigned {
"invite_room_state"?: StrippedState[];
"m.relations"?: Record<RelationType | string, any>; // No common pattern for aggregated relations
"msc4354_sticky_duration_ttl_ms"?: number;
"msc4354_sticky_ttl_start_ms"?: number;
[UNSIGNED_THREAD_ID_FIELD.name]?: string;
"membership"?: Membership;
"io.element.msc4115.membership"?: Membership;
Expand Down Expand Up @@ -463,7 +464,10 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
this.reEmitter = new TypedReEmitter(this);
if (this.unstableStickyInfo) {
if (this.unstableStickyInfo.duration_ttl_ms) {
this.unstableStickyExpiresAt = now + this.unstableStickyInfo.duration_ttl_ms;
const established = this.unstableStickyInfo?.ttl_start_ms ?? now;
const elapsed = now - established;
const remainingTtl = this.unstableStickyInfo.duration_ttl_ms - elapsed;
this.unstableStickyExpiresAt = now + remainingTtl;
} else {
// Bound the timestamp so it doesn't come from the future.
this.unstableStickyExpiresAt = Math.min(now, this.getTs()) + this.unstableStickyInfo.duration_ms;
Expand Down Expand Up @@ -1768,14 +1772,17 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
*
* `duration_ms` is safely bounded to a hour.
*/
public get unstableStickyInfo(): { duration_ms: number; duration_ttl_ms?: number } | undefined {
public get unstableStickyInfo():
| { duration_ms: number; duration_ttl_ms?: number; ttl_start_ms?: number }
| undefined {
if (!this.event.msc4354_sticky?.duration_ms) {
return undefined;
}
return {
duration_ms: Math.min(MAX_STICKY_DURATION_MS, this.event.msc4354_sticky.duration_ms),
// This is assumed to be bounded server-side.
duration_ttl_ms: this.event.unsigned?.msc4354_sticky_duration_ttl_ms,
ttl_start_ms: this.event.unsigned?.msc4354_sticky_ttl_start_ms,
};
}
}
Expand Down
Loading