From ab75d5097e1f87c37f761809bb3fa3a3c44eb1f6 Mon Sep 17 00:00:00 2001 From: Wim Date: Sun, 6 Feb 2022 00:59:34 +0100 Subject: [PATCH] Use own gomatrix fork again. Fixes #1382 (#1713) --- go.mod | 2 ++ go.sum | 4 ++-- vendor/github.com/matrix-org/gomatrix/events.go | 10 +++++----- vendor/modules.txt | 5 +++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 65183907..2d764c53 100644 --- a/go.mod +++ b/go.mod @@ -136,4 +136,6 @@ require ( gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) +replace github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 + go 1.17 diff --git a/go.sum b/go.sum index 17e4f747..26ff75d1 100644 --- a/go.sum +++ b/go.sum @@ -1077,14 +1077,14 @@ github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQ github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= -github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 h1:ZtO5uywdd5dLDCud4r0r55eP4j9FuUNpl60Gmntcop4= -github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s= github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696 h1:pmPKkN3RJM9wVMZidR99epzK0+gatQiqVtvP1FacZcQ= github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696/go.mod h1:c6MxwqHD+0HvtAJjsHMIdPCiAwGiQwPRPTp69ACMg8A= github.com/matterbridge/discordgo v0.21.2-0.20210201201054-fb39a175b4f7 h1:4J2YZuY8dIYrxbLMsWGqPZb/B59ygCwSBkyZHez5PSY= github.com/matterbridge/discordgo v0.21.2-0.20210201201054-fb39a175b4f7/go.mod h1:411nZYv0UMMrtppR5glXop1foboJiFAowy+42U+Ahvw= github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be h1:zlirT+LngOJ60G6FVzI87DljGZLUnfNzmXja61EjtYM= github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be/go.mod h1:ECDRehsR9TYTKCAsRS8/wLeOk6UUqDydw47ln7wG41Q= +github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 h1:dx8x2J3EsVwP3hBGNmVT/otz4b42p7TRQ6Cu4BK2910= +github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419/go.mod h1:/x38AoZf70fK9yZ5gs3BNCaF7/J4QEo4ZpwtLjX95eQ= github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75 h1:GslZKF7lW7oSisycGLpxPO+TnKJuA4VZuTWIfYZrClc= github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75/go.mod h1:yAjnZ34DuDyPHMPHHjOsTk/FefW4JJjoMMCGt/8uuQA= github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba h1:XleOY4IjAEIcxAh+IFwT5JT5Ze3RHiYz6m+4ZfZ0rc0= diff --git a/vendor/github.com/matrix-org/gomatrix/events.go b/vendor/github.com/matrix-org/gomatrix/events.go index cbc70a82..d555dc3f 100644 --- a/vendor/github.com/matrix-org/gomatrix/events.go +++ b/vendor/github.com/matrix-org/gomatrix/events.go @@ -45,8 +45,8 @@ func (event *Event) MessageType() (msgtype string, ok bool) { type TextMessage struct { MsgType string `json:"msgtype"` Body string `json:"body"` - FormattedBody string `json:"formatted_body"` - Format string `json:"format"` + FormattedBody string `json:"formatted_body,omitempty"` + Format string `json:"format,omitempty"` } // ThumbnailInfo contains info about an thumbnail image - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-image @@ -105,7 +105,7 @@ type HTMLMessage struct { // FileInfo contains info about an file - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-file type FileInfo struct { Mimetype string `json:"mimetype,omitempty"` - Size uint `json:"size,omitempty"` //filesize in bytes + Size uint `json:"size,omitempty"` // filesize in bytes } // FileMessage is an m.file event - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-file @@ -131,8 +131,8 @@ type LocationMessage struct { // AudioInfo contains info about an file - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-audio type AudioInfo struct { Mimetype string `json:"mimetype,omitempty"` - Size uint `json:"size,omitempty"` //filesize in bytes - Duration uint `json:"duration,omitempty"` //audio duration in ms + Size uint `json:"size,omitempty"` // filesize in bytes + Duration uint `json:"duration,omitempty"` // audio duration in ms } // AudioMessage is an m.audio event - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-audio diff --git a/vendor/modules.txt b/vendor/modules.txt index acc0d83c..91c6d568 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -186,8 +186,8 @@ github.com/lrstanley/girc # github.com/magiconair/properties v1.8.5 ## explicit; go 1.13 github.com/magiconair/properties -# github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 -## explicit; go 1.12 +# github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419 +## explicit; go 1.17 github.com/matrix-org/gomatrix # github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696 ## explicit @@ -604,3 +604,4 @@ layeh.com/gumble/gumble layeh.com/gumble/gumble/MumbleProto layeh.com/gumble/gumble/varint layeh.com/gumble/gumbleutil +# github.com/matrix-org/gomatrix => github.com/matterbridge/gomatrix v0.0.0-20220205235239-607eb9ee6419