Fix private chat handling code

src/services/matrix.service.js

@@ -697,11 +697,15 @@ export default {
             for (const room of this.rooms) {
               // Is the other member the one we are looking for?
               if (this.isDirectRoomWith(room, userId)) {
+                if (room.getMyMembership() == "invite") {
+                  this.matrixClient.joinRoom(room.roomId);
+                } else {
                   var member = room.getMember(userId);
                   if (member && member.membership != "join") {
                     // Resend invite
                     this.matrixClient.invite(room.roomId, userId);
                   }
+                }
                 resolve(room);
                 return;
               }
@@ -757,22 +761,17 @@ export default {
         isDirectRoomWith(room, userId) {
           if (
             room.getJoinRule() == "invite" &&
-            room.selfMembership == "join" &&
+            room.getMembers().length == 2
-            room.getInvitedAndJoinedMemberCount() == 2
-          ) {
-            // Is the other member the one we are looking for?
-            if (
-              room
-                .getMembersWithMembership("join")
-                .some((item) => item.userId == userId)
           ) {
+            let other = room.getMember(userId);
+            if (other) {
+              if (room.getMyMembership() == "invite" && other.membership == "join") {
                 return true;
-            } else if (
+              } else if (room.getMyMembership() == "join" && room.canInvite(this.currentUserId)) {
-              room
-                .getMembersWithMembership("invite")
-                .some((item) => item.userId == userId)
-            ) {
                 return true;
+              } else if (room.getMyMembership() == "join" && other.membership == "join") {
+                return true;
+              }
             }
           }
           return false;