Merge 196e5bc106 into 103bfc31c6

fix: call EnsureJoined with ctx
2024-03-12 12:38:24 +01:00 · 2024-03-12 12:37:58 +01:00
1 changed files with 2 additions and 2 deletions
--- a/portal.go
+++ b/portal.go
@ -2313,9 +2313,9 @@ func (portal *Portal) CreateMatrixRoom(ctx context.Context, user *User, groupInf
 		}
 		if portal.bridge.Config.Bridge.PrivateChatSelfPuppets {
 			rec := portal.bridge.GetPuppetByJID(portal.Key.Receiver)
-			err = rec.DefaultIntent().EnsureJoined(portal.MXID)
+			err = rec.DefaultIntent().EnsureJoined(ctx, portal.MXID)
 			if err != nil {
-				portal.log.Errorln("Failed to join created portal with puppet:", err)
+				log.Err(err).Msg("Failed to join created portal with puppet")
 			}
 		}
Author	SHA1	Message	Date
Timo Ley	072847512d	Merge `196e5bc106` into `103bfc31c6`	2024-03-12 12:38:24 +01:00
Timo Ley	196e5bc106	fix: call EnsureJoined with ctx	2024-03-12 12:37:58 +01:00