Merge branch 'develop' into departify

2017-10-27 19:23:13 +02:00
parent 53e983f9c7 27083df0f9
commit 95b2392104
17 changed files with 202 additions and 60 deletions
@@ -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;