mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Provide EventProvider to gmsl.PerformJoin directly

Browse source
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
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
federationapi/internal/perform.go
View file

@ -159,7 +159,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
PrivateKey: r.cfg.Matrix.PrivateKey, PrivateKey: r.cfg.Matrix.PrivateKey,
KeyID: r.cfg.Matrix.KeyID, KeyID: r.cfg.Matrix.KeyID,
KeyRing: r.keyRing, KeyRing: r.keyRing,
EventProvider: federatedEventProvider, EventProvider: federatedEventProvider(ctx, r.federation, r.keyRing, user.Domain(), serverName),
} }
callbacks := fclient.PerformJoinCallbacks{ callbacks := fclient.PerformJoinCallbacks{
FederationFailure: func(server spec.ServerName) { 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) 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( if err = roomserverAPI.SendEventWithState(
context.Background(), context.Background(),
r.rsAPI, r.rsAPI,