From bc5355d4ffa7c676f8e9a923572266310242813f Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 11 Sep 2017 18:42:48 +0100 Subject: [PATCH] Fix err not being initialised --- .../matrix-org/dendrite/federationapi/writers/threepid.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go b/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go index b76fc1069..46f41dede 100644 --- a/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go +++ b/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go @@ -165,23 +165,23 @@ func createInviteFrom3PIDInvite( // them responded with an error. func sendToRemoteServer( inv invite, federation *gomatrixserverlib.FederationClient, cfg config.Dendrite, -) error { +) (err error) { remoteServers := make([]gomatrixserverlib.ServerName, 2) _, remoteServers[0], err = gomatrixserverlib.SplitID('@', inv.Sender) if err != nil { - return err + return } // 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 err + return } for _, server := range remoteServers { err = federation.ExchangeThirdPartyInvite(server, *builder) if err == nil { - return nil + return } logrus.WithError(err).Warn("Failed to send 3PID invite via %s.", server) }