Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix regression of edits showing up in the timeline with hidden events shown #8260

Merged
merged 3 commits into from
Apr 8, 2022
Merged

Fix regression of edits showing up in the timeline with hidden events shown #8260

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
b40cde3
Tidy
t3chguy Apr 8, 2022
375b477
Fix regression of edits showing up in the timeline with show hidden e…
t3chguy Apr 8, 2022
99f1445
Re-add wrapped factory pattern to save bunch of SettingsStore calls
t3chguy Apr 8, 2022
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
4 changes: 4 additions & 0 deletions src/events/EventTileFactory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ export function pickFactory(mxEvent: MatrixEvent, cli: MatrixClient, asHiddenEv?
return MessageEventFactory;
}

if (mxEvent.isRelation(RelationType.Replace)) {
return noEventFactoryFactory();
}

return EVENT_TILE_TYPES[evType] ?? noEventFactoryFactory();
}

Expand Down
5 changes: 3 additions & 2 deletions src/shouldHideEvent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";

import SettingsStore from "./settings/SettingsStore";
import { IRoomState } from "./components/structures/RoomView";
Expand All @@ -29,7 +30,7 @@ interface IDiff {

function memberEventDiff(ev: MatrixEvent): IDiff {
const diff: IDiff = {
isMemberEvent: ev.getType() === 'm.room.member',
isMemberEvent: ev.getType() === EventType.RoomMember,
};

// If is not a Member Event then the other checks do not apply, so bail early.
Expand Down Expand Up @@ -67,7 +68,7 @@ export default function shouldHideEvent(ev: MatrixEvent, ctx?: IRoomState): bool
if (ev.isRedacted() && !isEnabled('showRedactions') && !ev.getThread()) return true;

// Hide replacement events since they update the original tile (if enabled)
if (ev.isRelation("m.replace")) return true;
if (ev.isRelation(RelationType.Replace)) return true;

const eventDiff = memberEventDiff(ev);

Expand Down