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

Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-dialog

pull/3921/head
Luke Barnard 2017-05-16 13:49:18 +01:00
parent 48856c31f8 e6f6b8cebd
commit 36ec39ffc0
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.sample.json
View File

@ -10,5 +10,6 @@
"servers": [
"matrix.org"
]
}
},
"welcomeUserId": "@RiotBot:matrix.org"
}

6
src/components/structures/RightPanel.js
View File

@ -89,11 +89,7 @@ module.exports = React.createClass({
onInviteButtonClick: function() {
if (MatrixClientPeg.get().isGuest()) {
var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
Modal.createDialog(NeedToRegisterDialog, {
title: "Please Register",
description: "Guest users can't invite users. Please register to invite."
});
dis.dispatch({action: 'view_set_mxid'});
return;
}

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

@ -335,11 +335,7 @@ module.exports = React.createClass({
// to the directory.
if (MatrixClientPeg.get().isGuest()) {
if (!room.world_readable && !room.guest_can_join) {
var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
Modal.createDialog(NeedToRegisterDialog, {
title: "Failed to join the room",
description: "This room is inaccessible to guests. You may be able to join if you register."
});
dis.dispatch({action: 'view_set_mxid'});
return;
}
}