Skip to content

Fix my fix for my fix of timeline ordering a final time #979

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
7w1 merged 2 commits into from
Jun 22, 2026
Merged

Fix my fix for my fix of timeline ordering a final time #979

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
6923101
fix my fix a final time
7w1 Jun 22, 2026
ba0b9d0
formatting
7w1 Jun 22, 2026
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
90 changes: 78 additions & 12 deletions src/app/hooks/timeline/useProcessedTimeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,28 @@ const computeCollapseAndDividers = (

const mergeDraftsAndExtras = (
result: ProcessedEvent[],
extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[]
extras: {
mEvent: MatrixEvent;
timelineSet: EventTimelineSet;
parentId: string;
itemIndex?: number;
}[]
): ProcessedEventDraft[] => {
const resultDrafts = result.map(
({ collapsed: _c, willRenderNewDivider: _n, willRenderDayDivider: _d, ...draft }) => draft
);

const extraDrafts = extras
.map(({ mEvent, timelineSet, parentTs }) => ({
.map(({ mEvent, timelineSet, parentId, itemIndex = -1 }) => ({
draft: {
id: mEvent.getId()!,
itemIndex: -1,
itemIndex,
mEvent,
timelineSet,
eventSender: mEvent.getSender() ?? null,
},
effectiveTs: Math.max(mEvent.getTs(), parentTs),
effectiveTs: mEvent.getTs(),
parentId,
}))
.toSorted((a, b) => a.effectiveTs - b.effectiveTs);

Expand All @@ -174,13 +180,21 @@ const mergeDraftsAndExtras = (

for (const extra of extraDrafts) {
const extraTs = extra.effectiveTs;
let insertIdx = 0;
for (let i = resultDrafts.length - 1; i >= 0; i -= 1) {
if (resultDrafts[i]!.mEvent.getTs() <= extraTs) {
insertIdx = i + 1;
let parentIdx = -1;
for (let i = 0; i < resultDrafts.length; i += 1) {
if (resultDrafts[i]!.id === extra.parentId) {
parentIdx = i;
break;
}
}

let insertIdx = parentIdx + 1;
for (let i = parentIdx + 1; i < resultDrafts.length; i += 1) {
if (resultDrafts[i]!.mEvent.getTs() > extraTs) {
break;
}
insertIdx = i + 1;
}
buckets[insertIdx]!.push(extra.draft);
}

Expand All @@ -207,6 +221,31 @@ const mergeRelationReactions = (
if (hideMemberInReadOnly && isReadOnly) return result;

const existingIds = new Set(result.map((event) => event.id));
const baseDrafts: ProcessedEvent[] = [];
const inlineExtras: {
mEvent: MatrixEvent;
timelineSet: EventTimelineSet;
parentId: string;
itemIndex: number;
}[] = [];

for (const draft of result) {
if (isReactionEvent(draft.mEvent)) {
const relation = draft.mEvent.getRelation();
const parentId = relation?.event_id;
if (parentId) {
inlineExtras.push({
mEvent: draft.mEvent,
timelineSet: draft.timelineSet,
parentId,
itemIndex: draft.itemIndex,
});
continue;
}
}
baseDrafts.push(draft);
}

const extras = collectRelationReactionEvents(
linkedTimelines,
existingIds,
Expand All @@ -215,9 +254,10 @@ const mergeRelationReactions = (
hiddenEventReactionTombstone
);

if (extras.length === 0) return result;
const allExtras = [...inlineExtras, ...extras];
if (allExtras.length === 0) return baseDrafts;

const mergedDrafts = mergeDraftsAndExtras(result, extras);
const mergedDrafts = mergeDraftsAndExtras(baseDrafts, allExtras);

return computeCollapseAndDividers(mergedDrafts, mxUserId, readUptoEventId);
};
Expand All @@ -231,16 +271,42 @@ const mergeRelationEdits = (
readUptoEventId: string | undefined
): ProcessedEvent[] => {
const existingIds = new Set(result.map((event) => event.id));
const baseDrafts: ProcessedEvent[] = [];
const inlineExtras: {
mEvent: MatrixEvent;
timelineSet: EventTimelineSet;
parentId: string;
itemIndex: number;
}[] = [];

for (const draft of result) {
if (isEditEvent(draft.mEvent)) {
const relation = draft.mEvent.getRelation();
const parentId = relation?.event_id;
if (parentId) {
inlineExtras.push({
mEvent: draft.mEvent,
timelineSet: draft.timelineSet,
parentId,
itemIndex: draft.itemIndex,
});
continue;
}
}
baseDrafts.push(draft);
}

const extras = collectRelationEditEvents(
linkedTimelines,
existingIds,
ignoredUsersSet,
hiddenEventEdits
);

if (extras.length === 0) return result;
const allExtras = [...inlineExtras, ...extras];
if (allExtras.length === 0) return baseDrafts;

const mergedDrafts = mergeDraftsAndExtras(result, extras);
const mergedDrafts = mergeDraftsAndExtras(baseDrafts, allExtras);

return computeCollapseAndDividers(mergedDrafts, mxUserId, readUptoEventId);
};
Expand Down
12 changes: 6 additions & 6 deletions src/app/utils/room.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,10 +758,10 @@ export const collectRelationReactionEvents = (
ignoredUsersSet: Set<string>,
showReactions: boolean,
showReactionTombstones: boolean
): { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] => {
): { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentId: string }[] => {
if (!showReactions && !showReactionTombstones) return [];

const extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] = [];
const extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentId: string }[] = [];
const seen = new Set(existingIds);

for (const timeline of linkedTimelines) {
Expand All @@ -785,7 +785,7 @@ export const collectRelationReactionEvents = (
if (redacted && !showReactionTombstones) continue;
if (!redacted && !showReactions) continue;

extras.push({ mEvent: reaction, timelineSet, parentTs: parent.getTs() });
extras.push({ mEvent: reaction, timelineSet, parentId });
}
}
}
Expand All @@ -798,10 +798,10 @@ export const collectRelationEditEvents = (
existingIds: ReadonlySet<string>,
ignoredUsersSet: Set<string>,
showEdits: boolean
): { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] => {
): { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentId: string }[] => {
if (!showEdits) return [];

const extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentTs: number }[] = [];
const extras: { mEvent: MatrixEvent; timelineSet: EventTimelineSet; parentId: string }[] = [];
const seen = new Set(existingIds);

for (const timeline of linkedTimelines) {
Expand All @@ -821,7 +821,7 @@ export const collectRelationEditEvents = (
const sender = editEvent.getSender();
if (sender && ignoredUsersSet.has(sender)) continue;

extras.push({ mEvent: editEvent, timelineSet, parentTs: parent.getTs() });
extras.push({ mEvent: editEvent, timelineSet, parentId });
}
}
}
Expand Down
Loading