mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-08-22 06:51:21 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1029 from matrix-org/luke/fix-multi-welcome-user

Browse Source 
Don't do a deferred start chat if user is welcome user
This commit is contained in:
David Baker 2017-06-05 13:45:01 +01:00 committed by GitHub
commit cdd8cc41e2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -721,6 +721,9 @@ module.exports = React.createClass({
); );
// Use a deferred action to reshow the dialog once the user has registered // Use a deferred action to reshow the dialog once the user has registered
if (MatrixClientPeg.get().isGuest()) { if (MatrixClientPeg.get().isGuest()) {
// No point in making 2 DMs with welcome bot. This assumes view_set_mxid will
// result in a new DM with the welcome user.
if (userId !== this.props.config.welcomeUserId) {
dis.dispatch({ dis.dispatch({
action: 'do_after_sync_prepared', action: 'do_after_sync_prepared',
deferred_action: { deferred_action: {
@ -728,6 +731,7 @@ module.exports = React.createClass({
user_id: userId, user_id: userId,
}, },
}); });
}
dis.dispatch({ dis.dispatch({
action: 'view_set_mxid', action: 'view_set_mxid',
}); });