Merge branch 'develop' into text-for-event-perf

This commit is contained in:
Robin Townsend 2021-07-16 18:24:22 -04:00
commit 158e6fa61c
167 changed files with 3559 additions and 1317 deletions

View file

@ -406,7 +406,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
// TODO: Implement granular (per-room) hide options
public shouldShowEvent(mxEv: MatrixEvent): boolean {
if (mxEv.sender && MatrixClientPeg.get().isUserIgnored(mxEv.sender.userId)) {
if (MatrixClientPeg.get().isUserIgnored(mxEv.getSender())) {
return false; // ignored = no show (only happens if the ignore happens after an event was received)
}