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 err not being initialised

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

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

@ -165,23 +165,23 @@ func createInviteFrom3PIDInvite(
// them responded with an error. // them responded with an error.
func sendToRemoteServer( func sendToRemoteServer(
inv invite, federation *gomatrixserverlib.FederationClient, cfg config.Dendrite, inv invite, federation *gomatrixserverlib.FederationClient, cfg config.Dendrite,
) error { ) (err error) {
remoteServers := make([]gomatrixserverlib.ServerName, 2) remoteServers := make([]gomatrixserverlib.ServerName, 2)
_, remoteServers[0], err = gomatrixserverlib.SplitID('@', inv.Sender) _, remoteServers[0], err = gomatrixserverlib.SplitID('@', inv.Sender)
if err != nil { if err != nil {
return err return
} }
// Fallback to the room's server if the sender's domain is the same as // Fallback to the room's server if the sender's domain is the same as
// the current server's // the current server's
_, remoteServers[1], err = gomatrixserverlib.SplitID('!', inv.RoomID) _, remoteServers[1], err = gomatrixserverlib.SplitID('!', inv.RoomID)
if err != nil { if err != nil {
return err return
} }
for _, server := range remoteServers { for _, server := range remoteServers {
err = federation.ExchangeThirdPartyInvite(server, *builder) err = federation.ExchangeThirdPartyInvite(server, *builder)
if err == nil { if err == nil {
return 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)
} }