OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4288 from matrix-org/t3chguy/react_stickers 

Deem m.sticker events as actionable for reacting
pull/21833/head
Michael Telatynski 2020-04-07 17:10:42 +01:00 committed by GitHub
parent 112e198a54 b489a7c0d5
commit 24a5d8355f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils/EventUtils.js
View File

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