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

Don't show for anything that doesn't have a msgtype and body 

otherwise the server will just reject it anyway

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/3688/head
Michael Telatynski 2017-04-24 22:43:02 +01:00
parent 2eb715002f
commit 0a1ebc2487
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/views/context_menus/MessageContextMenu.js
View File

@ -151,13 +151,17 @@ module.exports = React.createClass({
);
}
if (this.props.mxEvent.getType() === 'm.room.message'
&& this.props.mxEvent.getContent().msgtype !== 'm.bad.encrypted') {
forwardButton = (
<div className="mx_MessageContextMenu_field" onClick={this.onForwardClick}>
Forward Message
</div>
);
if (this.props.mxEvent.getType() === 'm.room.message') {
const content = this.props.mxEvent.getContent();
if (content.msgtype // truthy check msgtype
&& content.msgtype !== 'm.bad.encrypted'
&& content.hasOwnProperty('body')) {
forwardButton = (
<div className="mx_MessageContextMenu_field" onClick={this.onForwardClick}>
Forward Message
</div>
);
}
}
viewSourceButton = (