diff options
| author | Wim <wim@42.be> | 2022-02-06 00:59:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 00:59:34 +0100 |
| commit | ab75d5097e1f87c37f761809bb3fa3a3c44eb1f6 (patch) | |
| tree | 26c6e36a7a17ae34e50868564499f3701d3b5876 /vendor | |
| parent | c3644c8d3b4fa87e0a001d8c419edbfbd67ceb5b (diff) | |
| download | matterbridge-msglm-ab75d5097e1f87c37f761809bb3fa3a3c44eb1f6.tar.gz matterbridge-msglm-ab75d5097e1f87c37f761809bb3fa3a3c44eb1f6.tar.bz2 matterbridge-msglm-ab75d5097e1f87c37f761809bb3fa3a3c44eb1f6.zip | |
Use own gomatrix fork again. Fixes #1382 (#1713)
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/matrix-org/gomatrix/events.go | 10 | ||||
| -rw-r--r-- | vendor/modules.txt | 5 |
2 files changed, 8 insertions, 7 deletions
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 |