mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-28 01:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Shuffle order

Browse source
This commit is contained in:
Neil Alexander 2021-06-30 11:29:23 +01:00
parent 872788fd16
commit a0e9275031
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationapi/routing/send.go
View file

@ -476,11 +476,6 @@ func (t *txnReq) getServers(ctx context.Context, roomID string, event *gomatrixs
// The server that sent us the event should be sufficient to tell us about missing // The server that sent us the event should be sufficient to tell us about missing
// prev and auth events. // prev and auth events.
servers := []gomatrixserverlib.ServerName{t.Origin} servers := []gomatrixserverlib.ServerName{t.Origin}
// If a specific room-to-server provider exists then use that. This will primarily
// be used for the P2P demos.
if t.servers != nil {
return append(servers, t.servers.GetServersForRoom(ctx, roomID, event)...)
}
// If the event origin is different to the transaction origin then we can use // If the event origin is different to the transaction origin then we can use
// this as a last resort. The origin server that created the event would have // this as a last resort. The origin server that created the event would have
// had to know the auth and prev events. // had to know the auth and prev events.
@ -489,6 +484,11 @@ func (t *txnReq) getServers(ctx context.Context, roomID string, event *gomatrixs
servers = append(servers, origin) servers = append(servers, origin)
} }
} }
// If a specific room-to-server provider exists then use that. This will primarily
// be used for the P2P demos.
if t.servers != nil {
servers = append(servers, t.servers.GetServersForRoom(ctx, roomID, event)...)
}
return servers return servers
} }