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

Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip

Browse source 
Use the correct userId when displaying who redacted a message
This commit is contained in:
Luke Barnard 2017-10-25 17:47:22 +01:00 • committed by GitHub
commit 4cfbd66729
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,10 @@ module.exports = React.createClass({
render: function() {
let tooltip = _t("Removed or unknown message type");
if (this.props.mxEvent.isRedacted()) {
tooltip = _t("Message removed by %(userId)s", {userId: this.props.mxEvent.getSender()});
const redactedBecauseUserId = this.props.mxEvent.getUnsigned().redacted_because.sender;
tooltip = redactedBecauseUserId ?
_t("Message removed by %(userId)s", { userId: redactedBecauseUserId }) :
_t("Message removed");
}
const text = this.props.mxEvent.getContent().body;