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

Replace double truth test with something sane

Browse source 
Also typo
This commit is contained in:
David Baker 2016-09-28 11:04:13 +01:00
parent a32abae5a3
commit 5ca391f914
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -376,7 +376,7 @@ module.exports = React.createClass({
// rooms created by a user joining a bridge 'portal' alias to // rooms created by a user joining a bridge 'portal' alias to
// participate in that room or a foreign network. A room is a // participate in that room or a foreign network. A room is a
// portal room if it has exactly one alias and that alias matches // portal room if it has exactly one alias and that alias matches
// a pattern defined in the config. It's network is the key // a pattern defined in the config. Its network is the key
// of the pattern that it matches. // of the pattern that it matches.
// All other rooms are considered 'native matrix' rooms, and // All other rooms are considered 'native matrix' rooms, and
// go into the special '_matrix' network. // go into the special '_matrix' network.
@ -386,14 +386,12 @@ module.exports = React.createClass({
if (this.props.config.serverConfig && this.props.config.serverConfig[server] && this.props.config.serverConfig[server].networks) { if (this.props.config.serverConfig && this.props.config.serverConfig[server] && this.props.config.serverConfig[server].networks) {
for (const n of this.props.config.serverConfig[server].networks) { for (const n of this.props.config.serverConfig[server].networks) {
const pat = this.networkPatterns[n]; const pat = this.networkPatterns[n];
if (pat && pat) { if (pat && pat.test(room.aliases[0])) {
if (this.networkPatterns[n].test(room.aliases[0])) {
roomNetwork = n; roomNetwork = n;
} }
} }
} }
} }
}
return roomNetwork == network; return roomNetwork == network;
}, },