From 85e25748a8a052825e79ee761ebfe9b910438581 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 12 Nov 2025 23:09:49 +0200
Subject: [PATCH] bridgev2/portal: ensure join is sent using target intent

---
 bridgev2/portal.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bridgev2/portal.go b/bridgev2/portal.go
index c59d21c7..fcdfc02c 100644
--- a/bridgev2/portal.go
+++ b/bridgev2/portal.go
@@ -4363,7 +4363,11 @@ func (portal *Portal) syncParticipants(
 				currentMember.Membership = event.MembershipLeave
 			}
 		}
-		_, err = portal.sendStateWithIntentOrBot(ctx, thisEvtSender, event.StateMember, extraUserID.String(), wrappedContent, ts)
+		if content.Membership == event.MembershipJoin && intent != nil && intent.GetMXID() == extraUserID {
+			_, err = intent.SendState(ctx, portal.MXID, event.StateMember, extraUserID.String(), wrappedContent, ts)
+		} else {
+			_, err = portal.sendStateWithIntentOrBot(ctx, thisEvtSender, event.StateMember, extraUserID.String(), wrappedContent, ts)
+		}
 		if err != nil {
 			addLogContext(log.Err(err)).
 				Str("new_membership", string(content.Membership)).