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

Merge pull request #4120 from matrix-org/foldleft/cancel-events

Browse source 
Show cancel events as hidden events if we wouldn't usually render them
This commit is contained in:
Zoe 2020-02-24 17:02:11 +00:00 committed by GitHub
commit 866fdd6185
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/views/rooms/EventTile.js
View file

@ -100,6 +100,17 @@ export function getHandlerTile(ev) {
} }
} }
// sometimes MKeyVerificationConclusion declines to render. Jankily decline to render and
// fall back to showing hidden events, if we're viewing hidden events
// XXX: This is extremely a hack. Possibly these components should have an interface for
// declining to render?
if (type === "m.key.verification.cancel" && SettingsStore.getValue("showHiddenEventsInTimeline")) {
const MKeyVerificationConclusion = sdk.getComponent("messages.MKeyVerificationConclusion");
if (!MKeyVerificationConclusion.prototype._shouldRender.call(null, ev, ev.request)) {
return;
}
}
return ev.isState() ? stateEventTileTypes[type] : eventTileTypes[type]; return ev.isState() ? stateEventTileTypes[type] : eventTileTypes[type];
} }