PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Don't assume RoomMember has a state event in direct chat detection

Browse source 
Instead call the method on the member that takes lazy loading into account
This commit is contained in:
Bruno Windels 2018-07-12 19:39:52 +02:00
parent de3e143a8f
commit 19387805ac
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/components/structures/RoomView.js
View file

@ -749,21 +749,15 @@ module.exports = React.createClass({
}, },
_updateDMState() { _updateDMState() {
const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId); const me = this.state.room.getMember(MatrixClientPeg.get().getUserId());
if (!me || me.membership !== "join") { if (!me || me.membership !== "join") {
return; return;
} }
const roomId = this.state.room.roomId;
const dmInviter = me.getDirectChatInviter();
// The user may have accepted an invite with is_direct set if (dmInviter) {
if (me.events.member.getPrevContent().membership === "invite" && Rooms.setDMRoom(roomId, dmInviter);
me.events.member.getPrevContent().is_direct
) {
// This is a DM with the sender of the invite event (which we assume
// preceded the join event)
Rooms.setDMRoom(
this.state.room.roomId,
me.events.member.getUnsigned().prev_sender,
);
return; return;
} }
@ -777,11 +771,8 @@ module.exports = React.createClass({
// The user may have sent an invite with is_direct sent // The user may have sent an invite with is_direct sent
const other = invitedMembers[0]; const other = invitedMembers[0];
if (other && if (other && !!other.getDirectChatInviter()) {
other.membership === "invite" && Rooms.setDMRoom(roomId, other.userId);
other.events.member.getContent().is_direct
) {
Rooms.setDMRoom(this.state.room.roomId, other.userId);
return; return;
} }
}, },