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

switch to using MatrixClientPeg.get().maySendStateEvent() everywhere

Browse source
This commit is contained in:
Matthew Hodgson 2016-03-16 12:09:26 +00:00
parent 8a905dec58
commit 014ea9a328
1 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -272,7 +272,8 @@ module.exports = React.createClass({
var power_levels = this.props.room.currentState.getStateEvents('m.room.power_levels', ''); var power_levels = this.props.room.currentState.getStateEvents('m.room.power_levels', '');
var events_levels = (power_levels ? power_levels.events : {}) || {}; var events_levels = (power_levels ? power_levels.events : {}) || {};
var user_id = MatrixClientPeg.get().credentials.userId; var cli = MatrixClientPeg.get();
var user_id = cli.credentials.userId;
if (power_levels) { if (power_levels) {
power_levels = power_levels.getContent(); power_levels = power_levels.getContent();
@ -321,18 +322,7 @@ module.exports = React.createClass({
var state_default = (parseInt(power_levels ? power_levels.state_default : 0) || 0); var state_default = (parseInt(power_levels ? power_levels.state_default : 0) || 0);
var canSetEventType = function(eventType) { var canSetTag = !cli.isGuest();
if (MatrixClientPeg.get().isGuest()) {
return false;
}
var level = state_default;
if (events_levels[eventType] !== undefined) {
level = events_levels[eventType];
}
return current_user_level >= level;
}
var canSetTag = !MatrixClientPeg.get().isGuest();
var self = this; var self = this;
@ -425,19 +415,19 @@ module.exports = React.createClass({
<div className="mx_RoomSettings_toggles"> <div className="mx_RoomSettings_toggles">
<label> <label>
<input type="checkbox" disabled={ MatrixClientPeg.get().isGuest() } <input type="checkbox" disabled={ cli.isGuest() }
onChange={this._onToggle.bind(this, "areNotifsMuted", true, false)} onChange={this._onToggle.bind(this, "areNotifsMuted", true, false)}
defaultChecked={this.state.areNotifsMuted}/> defaultChecked={this.state.areNotifsMuted}/>
Mute notifications for this room Mute notifications for this room
</label> </label>
<label> <label>
<input type="checkbox" disabled={ !canSetEventType("m.room.join_rule") } <input type="checkbox" disabled={ !cli.maySendStateEvent("m.room.join_rule") }
onChange={this._onToggle.bind(this, "join_rule", "invite", "public")} onChange={this._onToggle.bind(this, "join_rule", "invite", "public")}
defaultChecked={this.state.join_rule !== "public"}/> defaultChecked={this.state.join_rule !== "public"}/>
Make this room private Make this room private
</label> </label>
<label> <label>
<input type="checkbox" disabled={ !canSetEventType("m.room.guest_access") } <input type="checkbox" disabled={ !cli.maySendStateEvent("m.room.guest_access") }
onChange={this._onToggle.bind(this, "guest_access", "can_join", "forbidden")} onChange={this._onToggle.bind(this, "guest_access", "can_join", "forbidden")}
defaultChecked={this.state.guest_access === "can_join"}/> defaultChecked={this.state.guest_access === "can_join"}/>
Let guests join this room Let guests join this room
@ -446,28 +436,28 @@ module.exports = React.createClass({
<h3>Who can read history?</h3> <h3>Who can read history?</h3>
<label htmlFor="hvis_wr"> <label htmlFor="hvis_wr">
<input type="radio" id="hvis_wr" name="historyVis" value="world_readable" <input type="radio" id="hvis_wr" name="historyVis" value="world_readable"
disabled={ !canSetEventType("m.room.history_visibility") } disabled={ !cli.maySendStateEvent("m.room.history_visibility") }
defaultChecked={historyVisibility === "world_readable"} defaultChecked={historyVisibility === "world_readable"}
onChange={this._onHistoryRadioToggle} /> onChange={this._onHistoryRadioToggle} />
Anyone Anyone
</label> </label>
<label htmlFor="hvis_sh"> <label htmlFor="hvis_sh">
<input type="radio" id="hvis_sh" name="historyVis" value="shared" <input type="radio" id="hvis_sh" name="historyVis" value="shared"
disabled={ !canSetEventType("m.room.history_visibility") } disabled={ !cli.maySendStateEvent("m.room.history_visibility") }
defaultChecked={historyVisibility === "shared"} defaultChecked={historyVisibility === "shared"}
onChange={this._onHistoryRadioToggle} /> onChange={this._onHistoryRadioToggle} />
Members only (since the room began) Members only (since the room began)
</label> </label>
<label htmlFor="hvis_inv"> <label htmlFor="hvis_inv">
<input type="radio" id="hvis_inv" name="historyVis" value="invited" <input type="radio" id="hvis_inv" name="historyVis" value="invited"
disabled={ !canSetEventType("m.room.history_visibility") } disabled={ !cli.maySendStateEvent("m.room.history_visibility") }
defaultChecked={historyVisibility === "invited"} defaultChecked={historyVisibility === "invited"}
onChange={this._onHistoryRadioToggle} /> onChange={this._onHistoryRadioToggle} />
Members only (since they were invited) Members only (since they were invited)
</label> </label>
<label htmlFor="hvis_joi"> <label htmlFor="hvis_joi">
<input type="radio" id="hvis_joi" name="historyVis" value="joined" <input type="radio" id="hvis_joi" name="historyVis" value="joined"
disabled={ !canSetEventType("m.room.history_visibility") } disabled={ !cli.maySendStateEvent("m.room.history_visibility") }
defaultChecked={historyVisibility === "joined"} defaultChecked={historyVisibility === "joined"}
onChange={this._onHistoryRadioToggle} /> onChange={this._onHistoryRadioToggle} />
Members only (since they joined) Members only (since they joined)
@ -487,8 +477,8 @@ module.exports = React.createClass({
<AliasSettings ref="alias_settings" <AliasSettings ref="alias_settings"
roomId={this.props.room.roomId} roomId={this.props.room.roomId}
canSetCanonicalAlias={ canSetEventType("m.room.canonical_alias") } canSetCanonicalAlias={ cli.maySendStateEvent("m.room.canonical_alias") }
canSetAliases={ canSetEventType("m.room.aliases") } canSetAliases={ cli.maySendStateEvent("m.room.aliases") }
canonicalAliasEvent={this.props.room.currentState.getStateEvents('m.room.canonical_alias', '')} canonicalAliasEvent={this.props.room.currentState.getStateEvents('m.room.canonical_alias', '')}
aliasEvents={this.props.room.currentState.getStateEvents('m.room.aliases')} /> aliasEvents={this.props.room.currentState.getStateEvents('m.room.aliases')} />