OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Do not show conf user join/parts
pull/21833/head
Kegsay 2015-12-16 13:56:55 +00:00
parent 524563d627 09e0d10d32
commit 186b727303
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/RoomView.js
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;

2
src/components/views/rooms/RoomList.js
View File

@ -182,7 +182,7 @@ module.exports = React.createClass({
return m.userId !== me.userId
})[0];
var ConfHandler = self.props.ConferenceHandler;
if (ConfHandler && ConfHandler.isConferenceUser(otherMember)) {
if (ConfHandler && ConfHandler.isConferenceUser(otherMember.userId)) {
// console.log("Hiding conference 1:1 room %s", room.roomId);
shouldShowRoom = false;
}