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

PR feedback

pull/2750/head
David Baker 2016-12-16 16:24:24 +00:00
parent 161978ab05
commit 2e73cd6c4d
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/components/structures/RoomDirectory.js
View File

@ -122,7 +122,7 @@ module.exports = React.createClass({
opts.server = my_server; opts.server = my_server;
} }
if (this.state.instanceId) { if (this.state.instanceId) {
opts.third_party_instanceId = this.state.instanceId; opts.third_party_instance_id = this.state.instanceId;
} else if (this.state.includeAll) { } else if (this.state.includeAll) {
opts.include_all_networks = true; opts.include_all_networks = true;
} }
@ -282,8 +282,7 @@ module.exports = React.createClass({
}, },
onJoinClick: function(alias) { onJoinClick: function(alias) {
// If we're on the 'Matrix' network (or all networks), // If we don't have a prticular instance id selected, just show that rooms alias
// just show that rooms alias
if (!this.state.instanceId) { if (!this.state.instanceId) {
// If the user specified an alias without a domain, add on whichever server is selected // If the user specified an alias without a domain, add on whichever server is selected
// in the dropdown // in the dropdown
@ -292,11 +291,10 @@ module.exports = React.createClass({
} }
this.showRoomAlias(alias); this.showRoomAlias(alias);
} else { } else {
// This is a 3rd party protocol. Let's see if we // This is a 3rd party protocol. Let's see if we can join it
// can join it const protocolName = protocolNameForInstanceId(this.protocols, this.state.instanceId);
const protocol_name = protocolNameForInstanceId(this.protocols, this.state.instanceId);
const instance = instanceForInstanceId(this.protocols, this.state.instanceId); const instance = instanceForInstanceId(this.protocols, this.state.instanceId);
const fields = this._getFieldsForThirdPartyLocation(alias, this.protocols[protocol_name], instance); const fields = protocolName ? this._getFieldsForThirdPartyLocation(alias, this.protocols[protocolName], instance) : null;
if (!fields) { if (!fields) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
@ -305,7 +303,7 @@ module.exports = React.createClass({
}); });
return; return;
} }
MatrixClientPeg.get().getThirdpartyLocation(protocol_name, fields).done((resp) => { MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).done((resp) => {
if (resp.length > 0 && resp[0].alias) { if (resp.length > 0 && resp[0].alias) {
this.showRoomAlias(resp[0].alias); this.showRoomAlias(resp[0].alias);
} else { } else {
@ -445,19 +443,19 @@ module.exports = React.createClass({
return pat.test(s); return pat.test(s);
}, },
_getFieldsForThirdPartyLocation: function(user_input, protocol, instance) { _getFieldsForThirdPartyLocation: function(userInput, protocol, instance) {
// make an object with the fields specified by that protocol. We // make an object with the fields specified by that protocol. We
// require that the values of all but the last field come from the // require that the values of all but the last field come from the
// instance. The last is the user input. // instance. The last is the user input.
const required_fields = protocol.location_fields; const requiredFields = protocol.location_fields;
if (!required_fields) return null; if (!requiredFields) return null;
const fields = {}; const fields = {};
for (let i = 0; i < required_fields.length - 1; ++i) { for (let i = 0; i < requiredFields.length - 1; ++i) {
const this_field = required_fields[i]; const thisField = requiredFields[i];
if (instance.fields[this_field] === undefined) return null; if (instance.fields[thisField] === undefined) return null;
fields[this_field] = instance.fields[this_field]; fields[thisField] = instance.fields[thisField];
} }
fields[required_fields[required_fields.length - 1]] = user_input; fields[requiredFields[requiredFields.length - 1]] = userInput;
return fields; return fields;
}, },
@ -506,17 +504,17 @@ module.exports = React.createClass({
</ScrollPanel>; </ScrollPanel>;
} }
const protocol_name = protocolNameForInstanceId(this.protocols, this.state.instanceId); const protocolName = protocolNameForInstanceId(this.protocols, this.state.instanceId);
let instance_expected_field_type; let instance_expected_field_type;
if ( if (
protocol_name && protocolName &&
this.protocols && this.protocols &&
this.protocols[protocol_name] && this.protocols[protocolName] &&
this.protocols[protocol_name].location_fields.length > 0 && this.protocols[protocolName].location_fields.length > 0 &&
this.protocols[protocol_name].field_types this.protocols[protocolName].field_types
) { ) {
const last_field = this.protocols[protocol_name].location_fields.slice(-1)[0]; const last_field = this.protocols[protocolName].location_fields.slice(-1)[0];
instance_expected_field_type = this.protocols[protocol_name].field_types[last_field]; instance_expected_field_type = this.protocols[protocolName].field_types[last_field];
} }
@ -528,9 +526,9 @@ module.exports = React.createClass({
} }
let showJoinButton = this._stringLooksLikeId(this.state.filterString, instance_expected_field_type); let showJoinButton = this._stringLooksLikeId(this.state.filterString, instance_expected_field_type);
if (protocol_name) { if (protocolName) {
const instance = instanceForInstanceId(this.protocols, this.state.instanceId); const instance = instanceForInstanceId(this.protocols, this.state.instanceId);
if (this._getFieldsForThirdPartyLocation(this.state.filterString, this.protocols[protocol_name], instance) === null) { if (this._getFieldsForThirdPartyLocation(this.state.filterString, this.protocols[protocolName], instance) === null) {
showJoinButton = false; showJoinButton = false;
} }
} }

3
src/components/views/directory/NetworkDropdown.js
View File

@ -180,7 +180,7 @@ export default class NetworkDropdown extends React.Component {
icon = <img src="img/network-matrix.svg" />; icon = <img src="img/network-matrix.svg" />;
span_class = 'mx_NetworkDropdown_menu_network'; span_class = 'mx_NetworkDropdown_menu_network';
} else { } else {
key = server + '_inst_'+instance.instance_id; key = server + '_inst_' + instance.instance_id;
icon = <img src={instance.icon || DEFAULT_ICON_URL} />; icon = <img src={instance.icon || DEFAULT_ICON_URL} />;
name = instance.desc; name = instance.desc;
span_class = 'mx_NetworkDropdown_menu_network'; span_class = 'mx_NetworkDropdown_menu_network';
@ -227,6 +227,7 @@ export default class NetworkDropdown extends React.Component {
NetworkDropdown.propTypes = { NetworkDropdown.propTypes = {
onOptionChange: React.PropTypes.func.isRequired, onOptionChange: React.PropTypes.func.isRequired,
protocols: React.PropTypes.object, protocols: React.PropTypes.object,
// The room directory config. May have a 'servers' key that is a list of server names to include in the dropdown
config: React.PropTypes.object, config: React.PropTypes.object,
}; };

4
src/utils/DirectoryUtils.js
View File

@ -3,7 +3,7 @@
export function instanceForInstanceId(protocols, instance_id) { export function instanceForInstanceId(protocols, instance_id) {
if (!instance_id) return null; if (!instance_id) return null;
for (const proto of Object.keys(protocols)) { for (const proto of Object.keys(protocols)) {
if (!protocols[proto].instances) continue; if (!protocols[proto].instances && protocols[proto].instances instanceof Array) continue;
for (const instance of protocols[proto].instances) { for (const instance of protocols[proto].instances) {
if (instance.instance_id == instance_id) return instance; if (instance.instance_id == instance_id) return instance;
} }
@ -15,7 +15,7 @@ export function instanceForInstanceId(protocols, instance_id) {
export function protocolNameForInstanceId(protocols, instance_id) { export function protocolNameForInstanceId(protocols, instance_id) {
if (!instance_id) return null; if (!instance_id) return null;
for (const proto of Object.keys(protocols)) { for (const proto of Object.keys(protocols)) {
if (!protocols[proto].instances) continue; if (!protocols[proto].instances && protocols[proto].instances instanceof Array) continue;
for (const instance of protocols[proto].instances) { for (const instance of protocols[proto].instances) {
if (instance.instance_id == instance_id) return proto; if (instance.instance_id == instance_id) return proto;
} }