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

Implement same behaviour as synapse

Browse source
This commit is contained in:
Brendan Abolivier 2017-09-11 18:24:01 +01:00
parent 58767542e7
commit 0e356e2d27
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go
View file

@ -122,15 +122,28 @@ func createInviteFrom3PIDInvite(
if !queryRes.RoomExists { if !queryRes.RoomExists {
// Use federation to auth the event // Use federation to auth the event
var remoteServer gomatrixserverlib.ServerName var remoteServers []gomatrixserverlib.ServerName
_, remoteServer, err = gomatrixserverlib.SplitID('!', inv.RoomID) _, remoteServers[0], err = gomatrixserverlib.SplitID('@', inv.Sender)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = federation.ExchangeThirdPartyInvite(remoteServer, *builder) // Fallback to the room's server if the sender's domain is the same as
// the current server's
_, remoteServers[1], err = gomatrixserverlib.SplitID('!', inv.RoomID)
if err != nil {
return nil, err return nil, err
} }
for _, server := range remoteServers {
if server == cfg.Matrix.ServerName {
continue
}
err = federation.ExchangeThirdPartyInvite(server, *builder)
return nil, err
}
}
// Auth the event locally // Auth the event locally
builder.Depth = queryRes.Depth builder.Depth = queryRes.Depth
builder.PrevEvents = queryRes.LatestEvents builder.PrevEvents = queryRes.LatestEvents