imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #458 from matrix-org/dbkr/createdoom_dm

Browse source 
Update createRoom to support creating DM rooms
This commit is contained in:
David Baker 2016-09-12 18:29:43 +01:00 • committed by GitHub
commit f6478f111a
4 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/dialogs/ChatInviteDialog.js
View file

@ -257,9 +257,7 @@ module.exports = React.createClass({
_startChat: function(addr) {
// Start the chat
createRoom().then(function(roomId) {
return Invite.inviteToRoom(roomId, addr);
})
createRoom({dmUserId: addr})
.catch(function(err) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {

6
src/components/views/rooms/MemberInfo.js
View file

@ -421,11 +421,7 @@ module.exports = React.createClass({
onNewDMClick: function() {
this.setState({ updating: this.state.updating + 1 });
createRoom({
createOpts: {
invite: [this.props.member.userId],
},
}).finally(() => {
createRoom({dmUserId: this.props.member.userId}).finally(() => {
this.props.onFinished();
this.setState({ updating: this.state.updating - 1 });
}).done();