From eb2fb84009591af94f00f110970f59c108b0a875 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 13 Nov 2025 17:32:14 +0200 Subject: [PATCH] appservice/intent: don't EnsureJoined when sending massaged own join event --- appservice/intent.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appservice/intent.go b/appservice/intent.go index 4635f59a..611bf6d8 100644 --- a/appservice/intent.go +++ b/appservice/intent.go @@ -243,7 +243,11 @@ func (intent *IntentAPI) SendStateEvent(ctx context.Context, roomID id.RoomID, e } func (intent *IntentAPI) SendMassagedStateEvent(ctx context.Context, roomID id.RoomID, eventType event.Type, stateKey string, contentJSON interface{}, ts int64) (*mautrix.RespSendEvent, error) { - if err := intent.EnsureJoined(ctx, roomID); err != nil { + if eventType != event.StateMember || stateKey != string(intent.UserID) { + if err := intent.EnsureJoined(ctx, roomID); err != nil { + return nil, err + } + } else if err := intent.EnsureRegistered(ctx); err != nil { return nil, err } contentJSON = intent.AddDoublePuppetValueWithTS(contentJSON, ts)