mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-22 09:15:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Mark the room as private (unlisted) too

Browse source 
Also clean up RoomDirectory a bit and just pass the room object around rather than the name / alias, so now we don't have to look up the room by ID again.
This commit is contained in:
David Baker 2016-06-22 14:52:55 +01:00
parent ad2541299f
commit ff5c7072d7
1 changed files with 66 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
src/components/structures/RoomDirectory.js
View file

@ -84,73 +84,77 @@ module.exports = React.createClass({
}); });
}, },
deleteAliasClicked: function(roomAlias) { /**
* A limited interface for removing rooms from the directory.
* Will set the room to not be publicly visible and delete the
* default alias. In the long term, it would be better to allow
* HS admins to do this through the RoomSettings interface, but
* this needs SPEC-417.
*/
removeFromDirectory: function(room) {
var alias = get_display_alias_for_room(room);
var name = room.name || alias || "Unnamed room";
var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(QuestionDialog, {
title: "Delete Alias",
description: `Are you sure you want to remove the alias '${roomAlias}'?`,
onFinished: (should_delete) => {
if (should_delete) {
var Loader = sdk.getComponent("elements.Spinner");
var modal = Modal.createDialog(Loader);
MatrixClientPeg.get().deleteAlias(roomAlias).done(() => { var room_alias = get_display_alias_for_room(room);
modal.close();
this.getPublicRooms(); Modal.createDialog(QuestionDialog, {
}, function(err) { title: "Remove from Directory",
modal.close(); description: `Delete the room alias '${room_alias}' and remove '${name}' from the directory?`,
Modal.createDialog(ErrorDialog, { onFinished: (should_delete) => {
title: "Failed to delete alias", if (!should_delete) return;
description: err.toString()
}); var Loader = sdk.getComponent("elements.Spinner");
var modal = Modal.createDialog(Loader);
var step = `remove '${name}' from the directory.`;
MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
step = 'delete the alias.';
MatrixClientPeg.get().deleteAlias(room_alias);
}).done(() => {
modal.close();
this.getPublicRooms();
}, function(err) {
modal.close();
Modal.createDialog(ErrorDialog, {
title: "Failed to "+step,
description: err.toString()
}); });
} });
} }
}); });
}, },
showRoom: function(roomId, roomAlias, ev) { showRoom: function(room, ev) {
if (ev.shiftKey) { if (ev.shiftKey) {
ev.preventDefault(); ev.preventDefault();
this.deleteAliasClicked(roomAlias); this.removeFromDirectory(room);
return; return;
} }
// extract the metadata from the publicRooms structure to pass
// as out-of-band data to view_room, because we get information
// here that we can't get other than by joining the room in some
// cases.
var room;
if (roomId) {
for (var i = 0; i < this.state.publicRooms.length; ++i) {
if (this.state.publicRooms[i].room_id == roomId) {
room = this.state.publicRooms[i];
break;
}
}
}
var oob_data = {}; var oob_data = {};
if (room) { if (MatrixClientPeg.get().isGuest()) {
if (MatrixClientPeg.get().isGuest()) { if (!room.world_readable && !room.guest_can_join) {
if (!room.world_readable && !room.guest_can_join) { var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog"); Modal.createDialog(NeedToRegisterDialog, {
Modal.createDialog(NeedToRegisterDialog, { title: "Failed to join the room",
title: "Failed to join the room", description: "This room is inaccessible to guests. You may be able to join if you register."
description: "This room is inaccessible to guests. You may be able to join if you register." });
}); return;
return;
}
} }
oob_data = {
avatarUrl: room.avatar_url,
// XXX: This logic is duplicated from the JS SDK which
// would normally decide what the name is.
name: room.name || room.canonical_alias || (room.aliases ? room.aliases[0] : "Unnamed room"),
};
} }
var room_alias = get_display_alias_for_room(room);
oob_data = {
avatarUrl: room.avatar_url,
// XXX: This logic is duplicated from the JS SDK which
// would normally decide what the name is.
name: room.name || room_alias || "Unnamed room",
};
var payload = { var payload = {
oob_data: oob_data, oob_data: oob_data,
action: 'view_room', action: 'view_room',
@ -159,10 +163,10 @@ module.exports = React.createClass({
// which servers to start querying. However, there's no other way to join rooms in // which servers to start querying. However, there's no other way to join rooms in
// this list without aliases at present, so if roomAlias isn't set here we have no // this list without aliases at present, so if roomAlias isn't set here we have no
// choice but to supply the ID. // choice but to supply the ID.
if (roomAlias) { if (room_alias) {
payload.room_alias = roomAlias; payload.room_alias = room_alias;
} else { } else {
payload.room_id = roomId; payload.room_id = room.room_id;
} }
dis.dispatch(payload); dis.dispatch(payload);
}, },
@ -185,8 +189,7 @@ 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 alias = rooms[i].canonical_alias || (rooms[i].aliases ? rooms[i].aliases[0] : ""); var name = rooms[i].name || get_display_alias_for_room(rooms[i]) || "Unnamed room";
var name = rooms[i].name || alias || "Unnamed room";
guestRead = null; guestRead = null;
guestJoin = null; guestJoin = null;
@ -211,7 +214,7 @@ module.exports = React.createClass({
rows.unshift( rows.unshift(
<tr key={ rooms[i].room_id } <tr key={ rooms[i].room_id }
onClick={self.showRoom.bind(null, rooms[i].room_id, alias)} onClick={self.showRoom.bind(null, rooms[i])}
// cancel onMouseDown otherwise shift-clicking highlights text // cancel onMouseDown otherwise shift-clicking highlights text
onMouseDown={(ev) => {ev.preventDefault();}} onMouseDown={(ev) => {ev.preventDefault();}}
> >
@ -228,7 +231,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">{ alias }</div> <div className="mx_RoomDirectory_alias">{ get_display_alias_for_room(rooms[i]) }</div>
</td> </td>
<td className="mx_RoomDirectory_roomMemberCount"> <td className="mx_RoomDirectory_roomMemberCount">
{ rooms[i].num_joined_members } { rooms[i].num_joined_members }
@ -276,3 +279,9 @@ module.exports = React.createClass({
); );
} }
}); });
// Similar to matrix-react-sdk's MatrixTools.getDisplayAliasForRoom
// but works with the objects we get from the public room list
function get_display_alias_for_room(room) {
return room.canonical_alias || (room.aliases ? room.aliases[0] : "");
}