imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle tagging for kicked rooms correctly

Browse source
This commit is contained in:
Matthew Hodgson 2016-03-18 19:59:58 +00:00
parent bfbb7a661e
commit 0250192477
1 changed files with 12 additions and 13 deletions
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) { MatrixClientPeg.get().getRooms().forEach(function(room) {
var me = room.getMember(MatrixClientPeg.get().credentials.userId); 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); s.lists["im.vector.fake.invite"].push(room);
} }
// XXX: somewhat hacky gut-wrenching to special-case kicks else if (me.membership == "join" || me.membership === "ban" ||
else if (me && me.membership === "leave" && me.events.member.getPrevContent().membership === "join") { (me.membership === "leave" && me.events.member.getPrevContent().membership === "join")) {
s.lists["im.vector.fake.recent"].push(room); var shouldShowRoom = true;
}
else if (me && me.membership === "leave") {
s.lists["im.vector.fake.archived"].push(room);
}
else {
var shouldShowRoom = (
me && (me.membership == "join" || me.membership === "ban")
);
// hiding conf rooms only ever toggles shouldShowRoom to false // 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 // we want to hide the 1:1 conf<->user room and not the group chat
var joinedMembers = room.getJoinedMembers(); var joinedMembers = room.getJoinedMembers();
if (joinedMembers.length === 2) { 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"]); //console.log("calculated new roomLists; im.vector.fake.recent = " + s.lists["im.vector.fake.recent"]);