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

Fix lint

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

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

@ -125,7 +125,7 @@ func createInviteFrom3PIDInvite(
if !queryRes.RoomExists {
// Use federation to auth the event
return sendToRemoteServer(inv, federation, cfg)
return nil, sendToRemoteServer(inv, federation, cfg, *builder)
}
// Auth the event locally
@ -165,6 +165,7 @@ func createInviteFrom3PIDInvite(
// them responded with an error.
func sendToRemoteServer(
inv invite, federation *gomatrixserverlib.FederationClient, cfg config.Dendrite,
builder gomatrixserverlib.EventBuilder,
) (err error) {
remoteServers := make([]gomatrixserverlib.ServerName, 2)
_, remoteServers[0], err = gomatrixserverlib.SplitID('@', inv.Sender)
@ -179,14 +180,14 @@ func sendToRemoteServer(
}
for _, server := range remoteServers {
err = federation.ExchangeThirdPartyInvite(server, *builder)
err = federation.ExchangeThirdPartyInvite(server, builder)
if err == nil {
return
}
logrus.WithError(err).Warn("Failed to send 3PID invite via %s.", server)
logrus.WithError(err).Warn("failed to send 3PID invite via %s", server)
}
return errors.New("Failed to send 3PID invite via any server.")
return errors.New("failed to send 3PID invite via any server")
}
// fillDisplayName looks in a list of auth events for a m.room.third_party_invite