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

Move join response params into a struct

Browse source
This commit is contained in:
Devon Hudson 2023-04-25 09:41:35 -06:00
parent 6e8666870d
commit 1e174e04eb
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
federationapi/internal/perform.go
View file

@ -170,7 +170,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
}, },
} }
event, respState, err := fclient.PerformJoin(ctx, r.federation, joinInput, callbacks) response, err := fclient.PerformJoin(ctx, r.federation, joinInput, callbacks)
if err != nil { if err != nil {
return err return err
} }
@ -181,7 +181,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
// joining a room, waiting for 200 OK then changing device keys and have those keys not be sent // joining a room, waiting for 200 OK then changing device keys and have those keys not be sent
// to other servers (this was a cause of a flakey sytest "Local device key changes get to remote servers") // to other servers (this was a cause of a flakey sytest "Local device key changes get to remote servers")
// The events are trusted now as we performed auth checks above. // The events are trusted now as we performed auth checks above.
joinedHosts, err := consumers.JoinedHostsFromEvents(respState.GetStateEvents().TrustedEvents(event.RoomVersion, false)) joinedHosts, err := consumers.JoinedHostsFromEvents(response.StateSnapshot.GetStateEvents().TrustedEvents(response.JoinEvent.RoomVersion, false))
if err != nil { if err != nil {
return fmt.Errorf("JoinedHostsFromEvents: failed to get joined hosts: %s", err) return fmt.Errorf("JoinedHostsFromEvents: failed to get joined hosts: %s", err)
} }
@ -197,8 +197,8 @@ func (r *FederationInternalAPI) performJoinUsingServer(
r.rsAPI, r.rsAPI,
user.Domain(), user.Domain(),
roomserverAPI.KindNew, roomserverAPI.KindNew,
respState, response.StateSnapshot,
event, response.JoinEvent,
serverName, serverName,
nil, nil,
false, false,