matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-30 02:21:17 +03:00
Code Activity

Do not show conf user join/parts

Browse Source
This commit is contained in:
Kegan Dougal
2015-12-16 11:54:29 +00:00
parent 8aaef34319
commit 09e0d10d32
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/RoomView.js
View File

@ -607,6 +607,12 @@ module.exports = React.createClass({
if (!EventTile.haveTileForEvent(mxEv)) { if (!EventTile.haveTileForEvent(mxEv)) {
continue; 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 continuation = false;
var last = 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 return m.userId !== me.userId
})[0]; })[0];
var ConfHandler = self.props.ConferenceHandler; 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); // console.log("Hiding conference 1:1 room %s", room.roomId);
shouldShowRoom = false; shouldShowRoom = false;
} }