PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Let TimelinePanel not send a receipt if there is no event (#10912)

Browse source
This commit is contained in:
Michael Weimann 2023-05-16 13:34:59 +02:00 committed by GitHub
parent da0f072ed9
commit acdbae3e8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/TimelinePanel.tsx
View file

@ -1082,7 +1082,9 @@ class TimelinePanel extends React.Component<IProps, IState> {
currentReadReceiptEventIndex: number | null,
lastReadEvent: MatrixEvent | null,
lastReadEventIndex: number | null,
): boolean {
): lastReadEvent is MatrixEvent {
if (!lastReadEvent) return false;
// We want to avoid sending out read receipts when we are looking at
// events in the past which are before the latest RR.
//
@ -1133,7 +1135,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
const lastReadEventIndex = this.getLastDisplayedEventIndex({
ignoreOwn: true,
});
const lastReadEvent: MatrixEvent | null = this.state.events[lastReadEventIndex ?? 0];
const lastReadEvent: MatrixEvent | null = this.state.events[lastReadEventIndex ?? 0] ?? null;
const shouldSendReadReceipt = this.shouldSendReadReceipt(
currentReadReceiptEventId,

12
test/components/structures/TimelinePanel-test.tsx
View file

@ -242,6 +242,18 @@ describe("TimelinePanel", () => {
TimelinePanel.roomReadMarkerTsMap = {};
});
it("when there is no event, it should not send any receipt", async () => {
setUpTimelineSet();
await renderTimelinePanel();
await flushPromises();
// @ts-ignore
await timelinePanel.sendReadReceipts();
expect(client.setRoomReadMarkers).not.toHaveBeenCalled();
expect(client.sendReadReceipt).not.toHaveBeenCalled();
});
describe("when there is a non-threaded timeline", () => {
beforeEach(() => {
setUpTimelineSet();