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

Fix bug where original event was inserted into timeline instead of the edit event #3398

Merged
merged 13 commits into from
May 25, 2023
Merged

Fix bug where original event was inserted into timeline instead of the edit event #3398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8bfa301
Fix an existing test for editing messages in threads
andybalaam May 24, 2023
35a8c5f
Move editing test into thread.spec.ts
andybalaam May 24, 2023
c27c56f
Isolate Thread global modification in beforeAll()
andybalaam May 24, 2023
22504d5
Delete unneeded setUnsigned call
andybalaam May 24, 2023
5dd1cba
Use standard message-creation methods
andybalaam May 24, 2023
6fd1f17
Rename event variables
andybalaam May 24, 2023
4539a21
Rename sender->user
andybalaam May 24, 2023
b451063
Remove unneeded variables
andybalaam May 24, 2023
920df86
Extract distractions into functions
andybalaam May 24, 2023
9839b3e
Fetch edits for thread messages
andybalaam May 25, 2023
e9dc9f2
Add a test for fetching edits on demand in a thread
andybalaam May 25, 2023
09be26a
Fix bug where original event was inserted into timeline instead of th…
andybalaam May 23, 2023
bad9606
Merge develop into andybalaam/insert-edit-no-original (using imerge)
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
19 changes: 6 additions & 13 deletions spec/unit/models/thread.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,21 +660,14 @@ describe("Thread", () => {
});
await thread.addEvent(messageToEdit, false);

// THIS IS THE CORRECT BEHAVIOUR
// Then both events end up in the timeline
//const lastEvent = thread.timeline.at(-1)!;
//const secondLastEvent = thread.timeline.at(-2)!;
//expect(lastEvent).toBe(editEvent);
//expect(secondLastEvent).toBe(messageToEdit);

//// And the first message has been edited
//expect(secondLastEvent.getContent().body).toEqual("edit");

// TODO: For now, we incorrecly DON'T add the event to the timeline
const lastEvent = thread.timeline.at(-1)!;
expect(lastEvent).toBe(messageToEdit);
// But the original is edited, as expected
expect(lastEvent.getContent().body).toEqual("edit");
const secondLastEvent = thread.timeline.at(-2)!;
expect(lastEvent).toBe(editEvent);
expect(secondLastEvent).toBe(messageToEdit);

// And the first message has been edited
expect(secondLastEvent.getContent().body).toEqual("edit");
});
});
});
Expand Down
5 changes: 3 additions & 2 deletions src/models/thread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,8 +530,9 @@ export class Thread extends ReadReceipt<EmittedEvents, EventHandlerMap> {
})
.then((relations) => {
if (relations.events.length) {
event.makeReplaced(relations.events[0]);
this.insertEventIntoTimeline(event);
const editEvent = relations.events[0];
event.makeReplaced(editEvent);
this.insertEventIntoTimeline(editEvent);
}
})
.catch((e) => {
Expand Down