Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/app/hooks/timeline/useProcessedTimeline.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ const dividerIds = (processed: ProcessedEvent[]) =>
processed.filter((e) => e.willRenderNewDivider).map((e) => e.id);

describe('useProcessedTimeline new-messages divider', () => {
it('deduplicates events from overlapping timeline windows', () => {
const event = createEvent({ id: '$duplicate' });

expect(renderedIds(processTimeline([event, event], undefined))).toEqual(['$duplicate']);
});

it('renders an event that is still encrypted', () => {
const processed = processTimeline(
[
Expand Down
6 changes: 5 additions & 1 deletion src/app/hooks/timeline/useProcessedTimeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ const mergeRelationEdits = (
type TimelineProcessingState = {
prevEvent?: MatrixEvent;
prevIteratedEventId?: string;
seenEventIds: Set<string>;
isPrevRendered: boolean;
newDivider: boolean;
dayDivider: boolean;
Expand All @@ -459,6 +460,7 @@ type TimelineProcessingOptions = Omit<
ResolvedHiddenEventSettings;

const emptyProcessingState = (): TimelineProcessingState => ({
seenEventIds: new Set(),
isPrevRendered: false,
newDivider: false,
dayDivider: false,
Expand Down Expand Up @@ -488,7 +490,7 @@ const processTimelineItems = (
hideMemberInReadOnly,
skipThreadFilter,
} = options;
const state = { ...initialState };
const state = { ...initialState, seenEventIds: new Set(initialState.seenEventIds) };
const result: ProcessedEvent[] = [];

for (const item of items) {
Expand All @@ -498,6 +500,8 @@ const processTimelineItems = (
const { threadRootId } = mEvent;
const mEventId = mEvent.getId();
if (!mEventId) continue;
if (state.seenEventIds.has(mEventId)) continue;
state.seenEventIds.add(mEventId);

if (!state.newDivider && readUptoEventId) {
state.newDivider = state.prevIteratedEventId === readUptoEventId;
Expand Down
Loading