Skip to content

Fix incorrect usage of unstable variant of is_falling_back #2227

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

Merged
t3chguy merged 2 commits into from
Mar 10, 2022
Merged

Fix incorrect usage of unstable variant of is_falling_back #2227

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
d7a8dc3
Fix incorrect unstable variant of `is_falling_back` and fix inverted …
t3chguy Mar 10, 2022
8082eff
Sneak in a tiny tidy-up
t3chguy Mar 10, 2022
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
2 changes: 1 addition & 1 deletion src/models/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export interface IEventRelation {
"m.in_reply_to"?: {
event_id: string;
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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/models/thread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export class Thread extends TypedEventEmitter<EmittedEvents, EventHandlerMap> {
// There is a risk that the `localTimestamp` approximation will not be accurate
// when threads are used over federation. That could results in the reply
// 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;
if (this.lastEvent.getId() !== this.id) {
// This counting only works when server side support is enabled
Expand Down