Merge pull request #54 from matrix-org/kegan/hide-fs-users

Do not show conf user join/parts
This commit is contained in:
Kegsay 2015-12-16 13:56:55 +00:00
commit 186b727303
2 changed files with 7 additions and 1 deletions

View file

@ -600,6 +600,12 @@ module.exports = React.createClass({
if (!EventTile.haveTileForEvent(mxEv)) {
continue;
}
if (this.props.ConferenceHandler && mxEv.getType() === "m.room.member") {
if (this.props.ConferenceHandler.isConferenceUser(mxEv.getSender()) ||
this.props.ConferenceHandler.isConferenceUser(mxEv.getStateKey())) {
continue; // suppress conf user join/parts
}
}
var continuation = false;
var last = false;