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

incorporate PR review, and explicitly spell out if the room has ended up with guest_access=forbidden but join_rules=invite

Browse source
This commit is contained in:
Matthew Hodgson 2016-03-22 12:10:58 +00:00
parent 8cfb0e9ef4
commit df905cfcb7
1 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/components/views/rooms/RoomSettings.js
View file

@ -56,15 +56,15 @@ module.exports = React.createClass({
tags_changed: false, tags_changed: false,
tags: tags, tags: tags,
areNotifsMuted: areNotifsMuted, areNotifsMuted: areNotifsMuted,
isRoomPublished: false, // updated in componentWillMount
}; };
}, },
componentWillMount: function() { componentWillMount: function() {
var self = this; MatrixClientPeg.get().getRoomDirectoryVisibility(
MatrixClientPeg.get().getRoomVisibility(
this.props.room.roomId this.props.room.roomId
).done((result) => { ).done((result) => {
self.setState({ isRoomPublished: result.visibility === "public" }); this.setState({ isRoomPublished: result.visibility === "public" });
}, (err) => { }, (err) => {
console.error("Failed to get room visibility: " + err); console.error("Failed to get room visibility: " + err);
}); });
@ -124,7 +124,7 @@ module.exports = React.createClass({
} }
if (this.state.isRoomPublished !== originalState.isRoomPublished) { if (this.state.isRoomPublished !== originalState.isRoomPublished) {
promises.push(MatrixClientPeg.get().setRoomVisibility( promises.push(MatrixClientPeg.get().setRoomDirectoryVisibility(
roomId, roomId,
this.state.isRoomPublished ? "public" : "private" this.state.isRoomPublished ? "public" : "private"
)); ));
@ -271,22 +271,30 @@ module.exports = React.createClass({
}, },
_onRoomAccessRadioToggle: function(ev) { _onRoomAccessRadioToggle: function(ev) {
var self = this;
// join_rule
// INVITE | PUBLIC
// ----------------------+----------------
// guest CAN_JOIN | inv_only | pub_with_guest
// access ----------------------+----------------
// FORBIDDEN | inv_only | pub_no_guest
// ----------------------+----------------
switch (ev.target.value) { switch (ev.target.value) {
case "invite_only": case "invite_only":
self.setState({ this.setState({
join_rule: "invite", join_rule: "invite",
guest_access: "can_join", guest_access: "can_join",
}); });
break; break;
case "public_no_guests": case "public_no_guests":
self.setState({ this.setState({
join_rule: "public", join_rule: "public",
guest_access: "forbidden", guest_access: "forbidden",
}); });
break; break;
case "public_with_guests": case "public_with_guests":
self.setState({ this.setState({
join_rule: "public", join_rule: "public",
guest_access: "can_join", guest_access: "can_join",
}); });
@ -483,6 +491,17 @@ module.exports = React.createClass({
</div> </div>
} }
var inviteGuestWarning;
if (this.state.join_rule !== "public" && this.state.guest_access === "forbidden") {
inviteGuestWarning =
<div className="mx_RoomSettings_warning">
Guests cannot join this room even if explicitly invited. <a href="#" onClick={ (e) => {
this.setState({ join_rule: "invite", guest_access: "can_join" });
e.preventDefault();
}}>Click here to fix</a>.
</div>
}
return ( return (
<div className="mx_RoomSettings"> <div className="mx_RoomSettings">
@ -497,11 +516,12 @@ module.exports = React.createClass({
</label> </label>
<div className="mx_RoomSettings_settings"> <div className="mx_RoomSettings_settings">
<h3>Who can access this room?</h3> <h3>Who can access this room?</h3>
{ inviteGuestWarning }
<label> <label>
<input type="radio" name="roomVis" value="invite_only" <input type="radio" name="roomVis" value="invite_only"
disabled={ !roomState.mayClientSendStateEvent("m.room.join_rules", cli) } disabled={ !roomState.mayClientSendStateEvent("m.room.join_rules", cli) }
onChange={this._onRoomAccessRadioToggle} onChange={this._onRoomAccessRadioToggle}
defaultChecked={this.state.join_rule !== "public"}/> checked={this.state.join_rule !== "public"}/>
Only people who have been invited Only people who have been invited
</label> </label>
<label> <label>
@ -509,7 +529,7 @@ module.exports = React.createClass({
disabled={ !(roomState.mayClientSendStateEvent("m.room.join_rules", cli) && disabled={ !(roomState.mayClientSendStateEvent("m.room.join_rules", cli) &&
roomState.mayClientSendStateEvent("m.room.guest_access", cli)) } roomState.mayClientSendStateEvent("m.room.guest_access", cli)) }
onChange={this._onRoomAccessRadioToggle} onChange={this._onRoomAccessRadioToggle}
defaultChecked={this.state.join_rule === "public" && this.state.guest_access !== "can_join"}/> checked={this.state.join_rule === "public" && this.state.guest_access !== "can_join"}/>
Anyone who knows the room's link, apart from guests Anyone who knows the room's link, apart from guests
</label> </label>
<label> <label>
@ -517,7 +537,7 @@ module.exports = React.createClass({
disabled={ !(roomState.mayClientSendStateEvent("m.room.join_rules", cli) && disabled={ !(roomState.mayClientSendStateEvent("m.room.join_rules", cli) &&
roomState.mayClientSendStateEvent("m.room.guest_access", cli)) } roomState.mayClientSendStateEvent("m.room.guest_access", cli)) }
onChange={this._onRoomAccessRadioToggle} onChange={this._onRoomAccessRadioToggle}
defaultChecked={this.state.join_rule === "public" && this.state.guest_access === "can_join"}/> checked={this.state.join_rule === "public" && this.state.guest_access === "can_join"}/>
Anyone who knows the room's link, including guests Anyone who knows the room's link, including guests
</label> </label>
{ addressWarning } { addressWarning }