OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

merge two opposing if statements

pull/21833/head
Michael Telatynski 2021-07-23 08:55:16 +01:00
parent 18bb4bce35
commit cd77b9f1af
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/views/dialogs/CreateRoomDialog.tsx
View File

@ -93,13 +93,18 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
const opts: IOpts = {}; const opts: IOpts = {};
const createOpts: IOpts["createOpts"] = opts.createOpts = {}; const createOpts: IOpts["createOpts"] = opts.createOpts = {};
createOpts.name = this.state.name; createOpts.name = this.state.name;
if (this.state.joinRule === JoinRule.Public) { if (this.state.joinRule === JoinRule.Public) {
createOpts.visibility = Visibility.Public; createOpts.visibility = Visibility.Public;
createOpts.preset = Preset.PublicChat; createOpts.preset = Preset.PublicChat;
opts.guestAccess = false; opts.guestAccess = false;
const { alias } = this.state; const { alias } = this.state;
createOpts.room_alias_name = alias.substr(1, alias.indexOf(":") - 1); createOpts.room_alias_name = alias.substr(1, alias.indexOf(":") - 1);
} else {
// If we cannot change encryption we pass `true` for safety, the server should automatically do this for us.
opts.encryption = this.state.canChangeEncryption ? this.state.isEncrypted : true;
} }
if (this.state.topic) { if (this.state.topic) {
createOpts.topic = this.state.topic; createOpts.topic = this.state.topic;
} }
@ -107,16 +112,6 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
createOpts.creation_content = { 'm.federate': false }; createOpts.creation_content = { 'm.federate': false };
} }
if (this.state.joinRule !== JoinRule.Public) {
if (this.state.canChangeEncryption) {
opts.encryption = this.state.isEncrypted;
} else {
// the server should automatically do this for us, but for safety
// we'll demand it too.
opts.encryption = true;
}
}
if (CommunityPrototypeStore.instance.getSelectedCommunityId()) { if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
opts.associatedWithCommunity = CommunityPrototypeStore.instance.getSelectedCommunityId(); opts.associatedWithCommunity = CommunityPrototypeStore.instance.getSelectedCommunityId();
} }