Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality

Overhaul MELS to deal with causality, kicks, etc.
2017-01-25 15:20:30 +00:00
parent 69b55fd9d1 f9ca2a8e59
commit 9cadc2f55f
4 changed files with 1011 additions and 147 deletions
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -281,7 +281,6 @@ module.exports = React.createClass({

        var isMembershipChange = (e) =>
            e.getType() === 'm.room.member'
-            && ['join', 'leave'].indexOf(e.getContent().membership) !== -1
            && (!e.getPrevContent() || e.getContent().membership !== e.getPrevContent().membership);

        for (i = 0; i < this.props.events.length; i++) {