PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #594 from vector-im/kegan/guest-access

Browse source 
Enable guest access
This commit is contained in:
Kegsay 2016-01-11 15:21:57 +00:00
commit f898986c73
2 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,17 +56,27 @@ module.exports = React.createClass({
}); });
}, },
joinRoom: function(roomId) { joinRoom: function(roomId, shouldPeek) {
var self = this; var self = this;
self.setState({ loading: true }); self.setState({ loading: true });
// XXX: check that JS SDK suppresses duplicate attempts to join the same room
MatrixClientPeg.get().joinRoom(roomId).done(function() { var joinOrPeekPromise;
if (shouldPeek) {
joinOrPeekPromise = MatrixClientPeg.get().peekInRoom(roomId);
}
else {
joinOrPeekPromise = MatrixClientPeg.get().joinRoom(roomId);
}
joinOrPeekPromise.done(function() {
dis.dispatch({ dis.dispatch({
action: 'view_room', action: 'view_room',
room_id: roomId room_id: roomId
}); });
}, function(err) { }, function(err) {
console.error("Failed to join room: %s", JSON.stringify(err)); console.error("Failed to join room: %s", JSON.stringify(err));
console.error(err);
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Failed to join room", title: "Failed to join room",
@ -87,13 +97,34 @@ module.exports = React.createClass({
}); });
var rows = []; var rows = [];
var self = this; var self = this;
var guestRead, guestJoin;
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 name = rooms[i].name || rooms[i].aliases[0];
guestRead = null;
guestJoin = null;
var shouldPeek = false;
if (rooms[i].world_readable) {
guestRead = (
<img src="img/members.svg"
alt="World Readable" title="World Readable" width="12" height="12" />
);
if (MatrixClientPeg.get().isGuest() && !rooms[i].guest_can_join) {
shouldPeek = true;
}
}
if (rooms[i].guest_can_join) {
guestJoin = (
<img src="img/leave.svg"
alt="Guests can join" title="Guests can join" width="12" height="12" />
);
}
// <img src={ MatrixClientPeg.get().getAvatarUrlForRoom(rooms[i].room_id, 40, 40, "crop") } width="40" height="40" alt=""/> // <img src={ MatrixClientPeg.get().getAvatarUrlForRoom(rooms[i].room_id, 40, 40, "crop") } width="40" height="40" alt=""/>
rows.unshift( rows.unshift(
<tbody key={ rooms[i].room_id }> <tbody key={ rooms[i].room_id }>
<tr onClick={self.joinRoom.bind(null, rooms[i].room_id)}> <tr onClick={self.joinRoom.bind(null, rooms[i].room_id, shouldPeek)}>
<td className="mx_RoomDirectory_name">{ name }</td> <td className="mx_RoomDirectory_name">{ name } {guestRead} {guestJoin}</td>
<td>{ rooms[i].aliases[0] }</td> <td>{ rooms[i].aliases[0] }</td>
<td>{ rooms[i].num_joined_members }</td> <td>{ rooms[i].num_joined_members }</td>
</tr> </tr>

3
src/vector/index.js
View file

@ -154,7 +154,8 @@ function loadApp() {
registrationUrl={makeRegistrationUrl()} registrationUrl={makeRegistrationUrl()}
ConferenceHandler={VectorConferenceHandler} ConferenceHandler={VectorConferenceHandler}
config={configJson} config={configJson}
startingQueryParams={parseQsFromFragment(window.location)} />, startingQueryParams={parseQsFromFragment(window.location)}
enableGuest={true} />,
document.getElementById('matrixchat') document.getElementById('matrixchat')
); );
} }