matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Invite the welcome user after registration if configured

Browse Source 
This will shift focus to the welcome user DM.

We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
This commit is contained in:
Luke Barnard
2017-05-12 17:39:38 +01:00
parent 81806e23bf
commit 683f1b8a1a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/MatrixChat.js
View File

@ -578,7 +578,7 @@ module.exports = React.createClass({
this.setState({loggingIn: true}); this.setState({loggingIn: true});
break; break;
case 'on_logged_in': case 'on_logged_in':
this._onLoggedIn(payload.teamToken, payload.isPasswordStored); this._onLoggedIn(payload.teamToken);
break; break;
case 'on_logged_out': case 'on_logged_out':
this._onLoggedOut(); this._onLoggedOut();
@ -801,8 +801,12 @@ module.exports = React.createClass({
this._teamToken = teamToken; this._teamToken = teamToken;
dis.dispatch({action: 'view_home_page'}); dis.dispatch({action: 'view_home_page'});
} else if (this._is_registered) { } else if (this._is_registered) {
if (this.props.config.welcomeUserId) {
createRoom({dmUserId: this.props.config.welcomeUserId});
return;
}
// The user has just logged in after registering // The user has just logged in after registering
dis.dispatch({action: 'view_user_settings'}); dis.dispatch({action: 'view_room_directory'});
} else { } else {
this._showScreenAfterLogin(); this._showScreenAfterLogin();
} }