Skip to content
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

Jump to bottom

Minor improvements to the code inserting events into timelines #3389

Merged
merged 3 commits into from
May 25, 2023
Merged

Minor improvements to the code inserting events into timelines #3389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e8494e
Remove unneeded pling
andybalaam May 19, 2023
c1c6b83
Comment clarifying why we bail out in insertEventIntoTimeline
andybalaam May 19, 2023
fd69156
Merge branch 'develop' into andybalaam/minor-improvements-to-insertEv…
andybalaam May 25, 2023
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-timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ export class EventTimeline {
// member event, whereas we want to set the .sender value for the ACTUAL
// member event itself.
if (!event.sender || event.getType() === EventType.RoomMember) {
EventTimeline.setEventMetadata(event, roomState!, false);
EventTimeline.setEventMetadata(event, roomState, false);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/models/thread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ export class Thread extends ReadReceipt<EmittedEvents, EventHandlerMap> {
if (!eventId) {
return;
}
// If the event is already in this thread, bail out
if (this.findEventById(eventId)) {
return;
}
Expand Down