From 6b015e8a88ae5ee258d7ebae168713c8e328f374 Mon Sep 17 00:00:00 2001
From: Mark Haines <mjark@negativecurvature.net>
Date: Mon, 11 Sep 2017 18:01:45 +0100
Subject: [PATCH] gb vendor update github.com/matrix-org/gomatrixserverlib

---
 vendor/manifest                               |  2 +-
 .../matrix-org/gomatrixserverlib/event.go     |  1 +
 .../gomatrixserverlib/federationclient.go     | 20 +++++++++++++++++++
 .../gomatrixserverlib/hooks/pre-commit        |  2 +-
 .../matrix-org/gomatrixserverlib/resolve.go   |  2 +-
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/vendor/manifest b/vendor/manifest
index 6f504ef5c..58663b495 100644
--- a/vendor/manifest
+++ b/vendor/manifest
@@ -116,7 +116,7 @@
 		{
 			"importpath": "github.com/matrix-org/gomatrixserverlib",
 			"repository": "https://github.com/matrix-org/gomatrixserverlib",
-			"revision": "d7795024c9a5757a06bda0b09bd5af9379ce46fe",
+			"revision": "fe45d482f2280c9f92f09eb6650e7aa3cca051c5",
 			"branch": "master"
 		},
 		{
diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/event.go b/vendor/src/github.com/matrix-org/gomatrixserverlib/event.go
index 9882d5475..71c065603 100644
--- a/vendor/src/github.com/matrix-org/gomatrixserverlib/event.go
+++ b/vendor/src/github.com/matrix-org/gomatrixserverlib/event.go
@@ -315,6 +315,7 @@ func (e Event) Sign(signingName string, keyID KeyID, privateKey ed25519.PrivateK
 	return Event{
 		redacted:  e.redacted,
 		eventJSON: eventJSON,
+		fields:    e.fields,
 	}
 }
 
diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/federationclient.go b/vendor/src/github.com/matrix-org/gomatrixserverlib/federationclient.go
index 71fa7b4fe..5a627401e 100644
--- a/vendor/src/github.com/matrix-org/gomatrixserverlib/federationclient.go
+++ b/vendor/src/github.com/matrix-org/gomatrixserverlib/federationclient.go
@@ -77,6 +77,10 @@ func (ac *FederationClient) doRequest(r FederationRequest, resBody interface{})
 		return err
 	}
 
+	if resBody == nil {
+		return nil
+	}
+
 	return json.Unmarshal(contents, resBody)
 }
 
@@ -125,6 +129,22 @@ func (ac *FederationClient) SendJoin(s ServerName, event Event) (res RespSendJoi
 	return
 }
 
+// ExchangeThirdPartyInvite sends the builder of a m.room.member event of
+// "invite" membership derived from a response from invites sent by an identity
+// server.
+// This is used to exchange a m.room.third_party_invite event for a m.room.member
+// one in a room the local server isn't a member of.
+func (ac *FederationClient) ExchangeThirdPartyInvite(s ServerName, builder EventBuilder) (err error) {
+	path := "/_matrix/federation/v1/exchange_third_party_invite/" +
+		url.PathEscape(builder.RoomID)
+	req := NewFederationRequest("PUT", s, path)
+	if err = req.SetContent(builder); err != nil {
+		return
+	}
+	err = ac.doRequest(req, nil)
+	return
+}
+
 // LookupState retrieves the room state for a room at an event from a
 // remote matrix server as full matrix events.
 func (ac *FederationClient) LookupState(s ServerName, roomID, eventID string) (res RespState, err error) {
diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/pre-commit b/vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/pre-commit
index 380734387..4ef525b50 100644
--- a/vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/pre-commit
+++ b/vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/pre-commit
@@ -4,7 +4,7 @@ set -eu
 
 echo "Installing lint search engine..."
 go get github.com/alecthomas/gometalinter/
-gometalinter --config=linter.json --install
+gometalinter --config=linter.json --install --update
 
 echo "Looking for lint..."
 gometalinter --config=linter.json
diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/resolve.go b/vendor/src/github.com/matrix-org/gomatrixserverlib/resolve.go
index 14f211931..ad241bc78 100644
--- a/vendor/src/github.com/matrix-org/gomatrixserverlib/resolve.go
+++ b/vendor/src/github.com/matrix-org/gomatrixserverlib/resolve.go
@@ -43,7 +43,7 @@ func LookupServer(serverName ServerName) (*DNSResult, error) { // nolint: gocycl
 	result.Hosts = map[string]HostResult{}
 
 	hosts := map[string][]net.SRV{}
-	if strings.Contains(string(serverName), ":") {
+	if !strings.Contains(string(serverName), ":") {
 		// If there isn't an explicit port set then try to look up the SRV record.
 		var err error
 		result.SRVCName, result.SRVRecords, err = net.LookupSRV("matrix", "tcp", string(serverName))