From 6e8666870dadc1ea99a8c15f79af347af8d538c5 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Tue, 25 Apr 2023 09:24:46 -0600 Subject: [PATCH] Provide EventProvider to gmsl.PerformJoin directly --- federationapi/internal/perform.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/federationapi/internal/perform.go b/federationapi/internal/perform.go index 941244efc..df27c1d94 100644 --- a/federationapi/internal/perform.go +++ b/federationapi/internal/perform.go @@ -159,7 +159,7 @@ func (r *FederationInternalAPI) performJoinUsingServer( PrivateKey: r.cfg.Matrix.PrivateKey, KeyID: r.cfg.Matrix.KeyID, KeyRing: r.keyRing, - EventProvider: federatedEventProvider, + EventProvider: federatedEventProvider(ctx, r.federation, r.keyRing, user.Domain(), serverName), } callbacks := fclient.PerformJoinCallbacks{ FederationFailure: func(server spec.ServerName) { @@ -191,6 +191,7 @@ func (r *FederationInternalAPI) performJoinUsingServer( return fmt.Errorf("UpdatedRoom: failed to update room with joined hosts: %s", err) } + // TODO: Can I change this to not take respState but instead just take an opaque list of events? if err = roomserverAPI.SendEventWithState( context.Background(), r.rsAPI,