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

Flag incoming DMs as such

Browse Source 
* Add the 'is_direct' flag to rooms created for DMs
 * For invites, look for the DM flag when getting the DM user ID for a room
 * When accepting an invite, look for the flag and mark the room as a DM room if appropriate.
This commit is contained in:
David Baker
2016-09-12 18:32:44 +01:00
parent f6478f111a
commit 2943db1072
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/structures/RoomView.js
View File

@ -36,6 +36,7 @@ var dis = require("../../dispatcher");
var Tinter = require("../../Tinter");
var rate_limited_func = require('../../ratelimitedfunc');
var ObjectUtils = require('../../ObjectUtils');
var Rooms = require('../../Rooms');
import UserProvider from '../../autocomplete/UserProvider';
@ -674,6 +675,20 @@ module.exports = React.createClass({
}
display_name_promise.then(() => {
// if this is an invite and has the 'direct' hint set, mark it as a DM room now.
if (this.state.room) {
const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
if (me.membership == 'invite') {
// The 'direct' hihnt is there, so declare that this is a DM room for
// whoever invited us.
if (me.events.member.getContent().is_direct) {
return Rooms.setDMRoom(this.state.room.roomId, me.events.member.getSender());
}
}
}
return q();
}).then(() => {
var sign_url = this.props.thirdPartyInvite ? this.props.thirdPartyInvite.inviteSignUrl : undefined;
return MatrixClientPeg.get().joinRoom(this.props.roomAddress,
{ inviteSignUrl: sign_url } )