Provide EventProvider to gmsl.PerformJoin directly

This commit is contained in:
Devon Hudson 2023-04-25 09:24:46 -06:00
parent a246690d5f
commit 6e8666870d
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628

View file

@ -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,