imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No text required, do not continuate after redacted even

Browse source 
It's curious, however, that a continuation occured after a redacted event, given that the event shouldn't have a sender
This commit is contained in:
Luke Barnard 2017-03-06 10:26:26 +00:00
parent abd71cd2ac
commit edccfeb20b
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/MessagePanel.js
View file

@ -411,7 +411,9 @@ module.exports = React.createClass({
// is this a continuation of the previous message? // is this a continuation of the previous message?
var continuation = false; var continuation = false;
if (prevEvent !== null && prevEvent.sender && mxEv.sender
if (prevEvent !== null
&& !prevEvent.isRedacted() && prevEvent.sender && mxEv.sender
&& mxEv.sender.userId === prevEvent.sender.userId && mxEv.sender.userId === prevEvent.sender.userId
&& mxEv.getType() == prevEvent.getType()) { && mxEv.getType() == prevEvent.getType()) {
continuation = true; continuation = true;

6
src/components/views/messages/UnknownBody.js
View file

@ -22,11 +22,7 @@ module.exports = React.createClass({
displayName: 'UnknownBody', displayName: 'UnknownBody',
render: function() { render: function() {
const ev = this.props.mxEvent; const text = this.props.mxEvent.getContent().body;
var text = ev.getContent().body;
if (ev.isRedacted()) {
text = "This event was redacted";
}
return ( return (
<span className="mx_UnknownBody"> <span className="mx_UnknownBody">
{text} {text}