From 14850f9c339f7063d0bef37e44984c58607f1de7 Mon Sep 17 00:00:00 2001 From: Anant Prakash Date: Tue, 31 Jul 2018 18:21:44 +0530 Subject: [PATCH] update gomatrixserverlib --- vendor/manifest | 28 +++++++++---------- .../matrix-org/gomatrixserverlib/edu.go | 23 +++++++++++++++ .../matrix-org/gomatrixserverlib/eventauth.go | 2 ++ .../gomatrixserverlib/hooks/install.sh | 0 .../gomatrixserverlib/hooks/pre-commit | 0 .../matrix-org/gomatrixserverlib/linter.json | 2 +- .../gomatrixserverlib/transaction.go | 5 +++- .../matrix-org/gomatrixserverlib/travis.sh | 0 8 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 vendor/src/github.com/matrix-org/gomatrixserverlib/edu.go mode change 100755 => 100644 vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/install.sh mode change 100755 => 100644 vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/pre-commit mode change 100755 => 100644 vendor/src/github.com/matrix-org/gomatrixserverlib/travis.sh diff --git a/vendor/manifest b/vendor/manifest index 71b834eed..a15048537 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -108,6 +108,19 @@ "revision": "392c28fe23e1c45ddba891b0320b3b5df220beea", "branch": "master" }, + { + "importpath": "github.com/jaegertracing/jaeger-client-go", + "repository": "https://github.com/jaegertracing/jaeger-client-go", + "revision": "3ad49a1d839b517923a6fdac36d81cbf7b744f37", + "branch": "master" + }, + { + "importpath": "github.com/jaegertracing/jaeger-lib/metrics", + "repository": "https://github.com/jaegertracing/jaeger-lib", + "revision": "21a3da6d66fe0e278072676fdc84cd4c9ccb9b67", + "branch": "master", + "path": "/metrics" + }, { "importpath": "github.com/klauspost/crc32", "repository": "https://github.com/klauspost/crc32", @@ -135,7 +148,7 @@ { "importpath": "github.com/matrix-org/gomatrixserverlib", "repository": "https://github.com/matrix-org/gomatrixserverlib", - "revision": "929828872b51e6733166553d6b1a20155b6ab829", + "revision": "677bbe93ffc9ad9ba5de615cd81185d0493f5d25", "branch": "master" }, { @@ -304,19 +317,6 @@ "revision": "54f72d32435d760d5604f17a82e2435b28dc4ba5", "branch": "master" }, - { - "importpath": "github.com/jaegertracing/jaeger-client-go", - "repository": "https://github.com/jaegertracing/jaeger-client-go", - "revision": "3ad49a1d839b517923a6fdac36d81cbf7b744f37", - "branch": "master" - }, - { - "importpath": "github.com/jaegertracing/jaeger-lib/metrics", - "repository": "https://github.com/jaegertracing/jaeger-lib", - "revision": "21a3da6d66fe0e278072676fdc84cd4c9ccb9b67", - "branch": "master", - "path": "/metrics" - }, { "importpath": "github.com/uber/tchannel-go", "repository": "https://github.com/uber/tchannel-go", diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/edu.go b/vendor/src/github.com/matrix-org/gomatrixserverlib/edu.go new file mode 100644 index 000000000..8cd01e031 --- /dev/null +++ b/vendor/src/github.com/matrix-org/gomatrixserverlib/edu.go @@ -0,0 +1,23 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package gomatrixserverlib + +// EDU represents a EDU received via federation +// https://matrix.org/docs/spec/server_server/unstable.html#edus +type EDU struct { + Type string `json:"edu_type"` + Origin string `json:"origin"` + Destination string `json:"destination"` + Content RawJSON `json:"content"` +} diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/eventauth.go b/vendor/src/github.com/matrix-org/gomatrixserverlib/eventauth.go index 428e9a0ee..43f7b0180 100644 --- a/vendor/src/github.com/matrix-org/gomatrixserverlib/eventauth.go +++ b/vendor/src/github.com/matrix-org/gomatrixserverlib/eventauth.go @@ -47,6 +47,8 @@ const ( MRoomHistoryVisibility = "m.room.history_visibility" // MRoomRedaction https://matrix.org/docs/spec/client_server/r0.2.0.html#id21 MRoomRedaction = "m.room.redaction" + // MTyping https://matrix.org/docs/spec/client_server/r0.3.0.html#m-typing + MTyping = "m.typing" ) // StateNeeded lists the event types and state_keys needed to authenticate an event. diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/install.sh b/vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/install.sh old mode 100755 new mode 100644 diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/pre-commit b/vendor/src/github.com/matrix-org/gomatrixserverlib/hooks/pre-commit old mode 100755 new mode 100644 diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/linter.json b/vendor/src/github.com/matrix-org/gomatrixserverlib/linter.json index aae749546..2309ddc48 100644 --- a/vendor/src/github.com/matrix-org/gomatrixserverlib/linter.json +++ b/vendor/src/github.com/matrix-org/gomatrixserverlib/linter.json @@ -11,7 +11,7 @@ "structcheck", "maligned", "ineffassign", - "gas", + "gosec", "misspell", "gosimple", "megacheck", diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/transaction.go b/vendor/src/github.com/matrix-org/gomatrixserverlib/transaction.go index 918c18e50..b97de9ef4 100644 --- a/vendor/src/github.com/matrix-org/gomatrixserverlib/transaction.go +++ b/vendor/src/github.com/matrix-org/gomatrixserverlib/transaction.go @@ -16,11 +16,14 @@ type Transaction struct { // the destination server. Multiple transactions can be sent by the origin // server to the destination server in parallel so there may be more than // one previous transaction. - PreviousIDs []TransactionID `json:"previous_ids"` + PreviousIDs []TransactionID `json:"previous_ids,omitempty"` // The room events pushed from the origin server to the destination server // by this transaction. The events should either be events that originate // on the origin server or be join m.room.member events. PDUs []Event `json:"pdus"` + // The ephemeral events pushed from origin server to destination server + // by this transaction. The events must orginate at the origin server. + EDUs []EDU `json:"edus,omitempty"` } // A TransactionID identifies a transaction sent by a matrix server to another diff --git a/vendor/src/github.com/matrix-org/gomatrixserverlib/travis.sh b/vendor/src/github.com/matrix-org/gomatrixserverlib/travis.sh old mode 100755 new mode 100644