Merge pull request #4626 from matrix-org/t3chguy/redact_react

Fix reacting to redactions
This commit is contained in:
Michael Telatynski 2020-05-26 11:58:54 +01:00 committed by GitHub
commit f4d69a9844
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -31,7 +31,7 @@ export function isContentActionable(mxEvent) {
// status is SENT before remote-echo, null after // status is SENT before remote-echo, null after
const isSent = !eventStatus || eventStatus === EventStatus.SENT; const isSent = !eventStatus || eventStatus === EventStatus.SENT;
if (isSent) { if (isSent && !mxEvent.isRedacted()) {
if (mxEvent.getType() === 'm.room.message') { if (mxEvent.getType() === 'm.room.message') {
const content = mxEvent.getContent(); const content = mxEvent.getContent();
if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) { if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {