1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00

Fix incorrect usage of unstable variant of is_falling_back (#2227)

This commit is contained in:
Michael Telatynski
2022-03-10 15:31:57 +00:00
committed by GitHub
parent 35a375e3d2
commit 40d1674a5c
2 changed files with 2 additions and 2 deletions

View File

@@ -107,7 +107,7 @@ export interface IEventRelation {
"m.in_reply_to"?: { "m.in_reply_to"?: {
event_id: string; event_id: string;
is_falling_back?: boolean; is_falling_back?: boolean;
"io.element.is_falling_back"?: boolean; // unstable variant of `is_falling_back` - MSC3440 "io.element.show_reply"?: boolean; // unstable variant of `is_falling_back` - MSC3440
}; };
key?: string; key?: string;
} }

View File

@@ -196,7 +196,7 @@ export class Thread extends TypedEventEmitter<EmittedEvents, EventHandlerMap> {
// There is a risk that the `localTimestamp` approximation will not be accurate // There is a risk that the `localTimestamp` approximation will not be accurate
// when threads are used over federation. That could results in the reply // when threads are used over federation. That could results in the reply
// count value drifting away from the value returned by the server // count value drifting away from the value returned by the server
if (!this.lastEvent || (isThreadReply && event.localTimestamp > this.replyToEvent.localTimestamp)) { if (!this.lastEvent || (isThreadReply && event.localTimestamp > this.lastEvent.localTimestamp)) {
this.lastEvent = event; this.lastEvent = event;
if (this.lastEvent.getId() !== this.id) { if (this.lastEvent.getId() !== this.id) {
// This counting only works when server side support is enabled // This counting only works when server side support is enabled