From f7c9ccd2185bb3f5ef990b39c9393200eba48876 Mon Sep 17 00:00:00 2001
From: Malte E <malte.e@mailbox.org>
Date: Thu, 15 Feb 2024 08:43:59 +0100
Subject: [PATCH] only ensureJoined if not already joined

---
 portal.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/portal.go b/portal.go
index aec75116..0ca6fc97 100644
--- a/portal.go
+++ b/portal.go
@@ -2131,21 +2131,27 @@ func (portal *Portal) SyncParticipants(ctx context.Context, source *User, info *
 		if member.UserID != source.SignalID && portal.MXID != "" {
 			userIDs[intent.UserID] = ((int)(member.Role) >> 1) * 50
 		}
+		delete(currentMembers, intent.UserID)
 		if portal.MXID != "" {
-			err := intent.EnsureJoined(ctx, portal.MXID)
-			if err != nil {
-				log.Err(err).Stringer("signal_user_id", member.UserID).Msg("Failed to ensure user is joined to portal")
+			if currentMembers[intent.UserID] != event.MembershipJoin {
+				err := intent.EnsureJoined(ctx, portal.MXID)
+				if err != nil {
+					log.Err(err).Stringer("signal_user_id", member.UserID).Msg("Failed to ensure user is joined to portal")
+				}
 			}
 			if puppet.customIntent == nil {
 				user := portal.bridge.GetUserBySignalID(member.UserID)
 				if user != nil {
+					delete(currentMembers, user.MXID)
+					currentMembership := currentMembers[user.MXID]
+					if currentMembership == event.MembershipJoin || currentMembership == event.MembershipInvite {
+						continue
+					}
 					user.ensureInvited(ctx, intent, portal.MXID, false)
 					userIDs[user.MXID] = ((int)(member.Role) >> 1) * 50
-					delete(currentMembers, user.MXID)
 				}
 			}
 		}
-		delete(currentMembers, intent.UserID)
 	}
 	if portal.MXID == "" {
 		return userIDs