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

handle tagging for kicked rooms correctly

pull/21833/head
Matthew Hodgson 2016-03-18 19:59:58 +00:00
parent bfbb7a661e
commit 0250192477
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,24 +190,17 @@ module.exports = React.createClass({
MatrixClientPeg.get().getRooms().forEach(function(room) {
var me = room.getMember(MatrixClientPeg.get().credentials.userId);
if (!me) return;
if (me && me.membership == "invite") {
if (me.membership == "invite") {
s.lists["im.vector.fake.invite"].push(room);
}
// XXX: somewhat hacky gut-wrenching to special-case kicks
else if (me && me.membership === "leave" && me.events.member.getPrevContent().membership === "join") {
s.lists["im.vector.fake.recent"].push(room);
}
else if (me && me.membership === "leave") {
s.lists["im.vector.fake.archived"].push(room);
}
else {
var shouldShowRoom = (
me && (me.membership == "join" || me.membership === "ban")
);
else if (me.membership == "join" || me.membership === "ban" ||
(me.membership === "leave" && me.events.member.getPrevContent().membership === "join")) {
var shouldShowRoom = true;
// hiding conf rooms only ever toggles shouldShowRoom to false
if (shouldShowRoom && HIDE_CONFERENCE_CHANS) {
if (HIDE_CONFERENCE_CHANS) {
// we want to hide the 1:1 conf<->user room and not the group chat
var joinedMembers = room.getJoinedMembers();
if (joinedMembers.length === 2) {
@ -236,6 +229,12 @@ module.exports = React.createClass({
}
}
}
else if (me.membership === "leave") {
s.lists["im.vector.fake.archived"].push(room);
}
else {
console.error("unrecognised membership: " + me.membership + " - this should never happen";
}
});
//console.log("calculated new roomLists; im.vector.fake.recent = " + s.lists["im.vector.fake.recent"]);