From 08d5b10902588c96ba15ba6f316ff2c85f8bfbbe Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 12 Jul 2022 12:24:31 +0300
Subject: [PATCH] Use same ensureUserInvited method everywere. Fixes #529

---
 matrix.go | 6 +++---
 portal.go | 7 -------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/matrix.go b/matrix.go
index 7967995..09ed53c 100644
--- a/matrix.go
+++ b/matrix.go
@@ -41,9 +41,9 @@ func (br *WABridge) CreatePrivatePortal(roomID id.RoomID, brInviter bridge.User,
 		return
 	}
 
-	err := portal.MainIntent().EnsureInvited(portal.MXID, inviter.MXID)
-	if err != nil {
-		br.Log.Warnfln("Failed to invite %s to existing private chat portal %s with %s: %v. Redirecting portal to new room...", inviter.MXID, portal.MXID, puppet.JID, err)
+	ok := portal.ensureUserInvited(inviter)
+	if !ok {
+		br.Log.Warnfln("Failed to invite %s to existing private chat portal %s with %s. Redirecting portal to new room...", inviter.MXID, portal.MXID, puppet.JID)
 		br.createPrivatePortalFromInvite(roomID, inviter, puppet, portal)
 		return
 	}
diff --git a/portal.go b/portal.go
index 53c5cd3..9b46154 100644
--- a/portal.go
+++ b/portal.go
@@ -1131,13 +1131,6 @@ func (portal *Portal) UpdateMetadata(user *User, groupInfo *types.GroupInfo) boo
 	return update
 }
 
-func (portal *Portal) ensureMXIDInvited(mxid id.UserID) {
-	err := portal.MainIntent().EnsureInvited(portal.MXID, mxid)
-	if err != nil {
-		portal.log.Warnfln("Failed to ensure %s is invited to %s: %v", mxid, portal.MXID, err)
-	}
-}
-
 func (portal *Portal) ensureUserInvited(user *User) bool {
 	return user.ensureInvited(portal.MainIntent(), portal.MXID, portal.IsPrivateChat())
 }