gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle canonical aliases correctly; search on names; support rooms with no aliases

This commit is contained in:
Matthew Hodgson 2016-03-23 11:26:18 +00:00
parent 490cbbd05f
commit c843ee3157
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/structures/RoomDirectory.js
View File

@ -83,7 +83,7 @@ module.exports = React.createClass({
avatarUrl: room.avatar_url, avatarUrl: room.avatar_url,
// XXX: This logic is duplicated from the JS SDK which // XXX: This logic is duplicated from the JS SDK which
// would normally decide what the name is. // would normally decide what the name is.
name: room.name || room.aliases[0], name: room.name || room.canonical_alias || room.aliases[0],
}; };
} }
@ -102,7 +102,9 @@ module.exports = React.createClass({
var rooms = this.state.publicRooms.filter(function(a) { var rooms = this.state.publicRooms.filter(function(a) {
// FIXME: if incrementally typing, keep narrowing down the search set // FIXME: if incrementally typing, keep narrowing down the search set
// incrementally rather than starting over each time. // incrementally rather than starting over each time.
return (a.aliases[0].toLowerCase().search(filter.toLowerCase()) >= 0 && a.num_joined_members > 0); return (((a.name && a.name.toLowerCase().search(filter.toLowerCase()) >= 0) ||
(a.aliases && a.aliases[0].toLowerCase().search(filter.toLowerCase()) >= 0)) &&
a.num_joined_members > 0);
}).sort(function(a,b) { }).sort(function(a,b) {
return a.num_joined_members - b.num_joined_members; return a.num_joined_members - b.num_joined_members;
}); });
@ -110,7 +112,8 @@ module.exports = React.createClass({
var self = this; var self = this;
var guestRead, guestJoin, perms; var guestRead, guestJoin, perms;
for (var i = 0; i < rooms.length; i++) { for (var i = 0; i < rooms.length; i++) {
var name = rooms[i].name || rooms[i].aliases[0]; var alias = rooms[i].canonical_alias || rooms[i].aliases[0];
var name = rooms[i].name || alias;
guestRead = null; guestRead = null;
guestJoin = null; guestJoin = null;
@ -148,7 +151,7 @@ module.exports = React.createClass({
<div className="mx_RoomDirectory_topic" <div className="mx_RoomDirectory_topic"
onClick={ function(e) { e.stopPropagation() } } onClick={ function(e) { e.stopPropagation() } }
dangerouslySetInnerHTML={{ __html: topic }}/> dangerouslySetInnerHTML={{ __html: topic }}/>
<div className="mx_RoomDirectory_alias">{ rooms[i].aliases[0] }</div> <div className="mx_RoomDirectory_alias">{ alias }</div>
</td> </td>
<td className="mx_RoomDirectory_roomMemberCount"> <td className="mx_RoomDirectory_roomMemberCount">
{ rooms[i].num_joined_members } { rooms[i].num_joined_members }