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

Merge pull request #1965 from matrix-org/t3chguy/show_redacted_sticker 

check type before msgtype in the case of `m.sticker` with msgtype
pull/21833/head
David Baker 2018-06-15 10:56:33 +01:00 committed by GitHub
parent 349f95d5ab 9a225840ce
commit 88a807d89b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/messages/MessageEvent.js
View File

@ -72,10 +72,10 @@ module.exports = React.createClass({
let BodyType = UnknownBody;
if (!this.props.mxEvent.isRedacted()) {
// only resolve BodyType if event is not redacted
if (msgtype && bodyTypes[msgtype]) {
BodyType = bodyTypes[msgtype];
} else if (type && evTypes[type]) {
if (type && evTypes[type]) {
BodyType = evTypes[type];
} else if (msgtype && bodyTypes[msgtype]) {
BodyType = bodyTypes[msgtype];
} else if (content.url) {
// Fallback to MFileBody if there's a content URL
BodyType = bodyTypes['m.file'];