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

Hopefully read DM rooms from account data

Browse source
This commit is contained in:
David Baker 2016-09-06 16:39:21 +01:00
parent 80dd927275
commit 8401323156
3 changed files with 69 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/components/views/rooms/RoomList.js
View file

@ -26,6 +26,7 @@ var dis = require("../../../dispatcher");
var sdk = require('../../../index');
var rate_limited_func = require('../../../ratelimitedfunc');
var MatrixTools = require('../../../MatrixTools');
var DMRoomMap = require('../../../DMRoomMap');
var HIDE_CONFERENCE_CHANS = true;
@ -209,8 +210,10 @@ module.exports = React.createClass({
s.lists["m.lowpriority"] = [];
s.lists["im.vector.fake.archived"] = [];
const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
MatrixClientPeg.get().getRooms().forEach(function(room) {
var me = room.getMember(MatrixClientPeg.get().credentials.userId);
const me = room.getMember(MatrixClientPeg.get().credentials.userId);
if (!me) return;
// console.log("room = " + room.name + ", me.membership = " + me.membership +
@ -224,7 +227,7 @@ module.exports = React.createClass({
else if (HIDE_CONFERENCE_CHANS && MatrixTools.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
// skip past this room & don't put it in any lists
}
else if (MatrixTools.isDirectMessageRoom(room, me)) {
else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
// "Direct Message" rooms
s.lists["im.vector.fake.direct"].push(room);
}
@ -253,6 +256,23 @@ module.exports = React.createClass({
}
});
if (s.lists["im.vector.fake.direct"].length == 0 && MatrixClientPeg.get().getAccountData('m.direct') === undefined) {
// scan through the 'recents' list for any rooms which look like DM rooms
// and make them DM rooms
const oldRecents = s.lists["im.vector.fake.recent"];
s.lists["im.vector.fake.recent"] = [];
for (const room of oldRecents) {
const me = room.getMember(MatrixClientPeg.get().credentials.userId);
if (!me || MatrixTools.looksLikeDirectMessageRoom(room, me)) {
s.lists["im.vector.fake.recent"].push(room);
} else {
s.lists["im.vector.fake.direct"].push(room);
}
}
}
//console.log("calculated new roomLists; im.vector.fake.recent = " + s.lists["im.vector.fake.recent"]);
// we actually apply the sorting to this when receiving the prop in RoomSubLists.