summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/matterbridge/gomatrix
diff options
context:
space:
mode:
authorWim <wim@42.be>2019-01-03 00:07:50 +0100
committerWim <wim@42.be>2019-01-03 00:07:50 +0100
commitd2044c647b2e57ec5d5a7684177cf5e2e3325714 (patch)
treec0cd092f4cb2bb528f455e33d7f989e8f3099b7b /vendor/github.com/matterbridge/gomatrix
parentc585d00f162cc244b381fcaaef7ac5b1efda2cf5 (diff)
downloadmatterbridge-msglm-d2044c647b2e57ec5d5a7684177cf5e2e3325714.tar.gz
matterbridge-msglm-d2044c647b2e57ec5d5a7684177cf5e2e3325714.tar.bz2
matterbridge-msglm-d2044c647b2e57ec5d5a7684177cf5e2e3325714.zip
Update vendor
* go-telegram-bot-api/telegram-bot-api * lrstanley/girc * matterbridge/gomatrix
Diffstat (limited to 'vendor/github.com/matterbridge/gomatrix')
-rw-r--r--vendor/github.com/matterbridge/gomatrix/client.go14
-rw-r--r--vendor/github.com/matterbridge/gomatrix/events.go6
2 files changed, 16 insertions, 4 deletions
diff --git a/vendor/github.com/matterbridge/gomatrix/client.go b/vendor/github.com/matterbridge/gomatrix/client.go
index 90a07c68..acc92258 100644
--- a/vendor/github.com/matterbridge/gomatrix/client.go
+++ b/vendor/github.com/matterbridge/gomatrix/client.go
@@ -461,7 +461,12 @@ func (cli *Client) SendStateEvent(roomID, eventType, stateKey string, contentJSO
// See http://matrix.org/docs/spec/client_server/r0.2.0.html#m-text
func (cli *Client) SendText(roomID, text string) (*RespSendEvent, error) {
return cli.SendMessageEvent(roomID, "m.room.message",
- TextMessage{"m.text", text})
+ TextMessage{"m.text", text, "", ""})
+}
+
+func (cli *Client) SendHTML(roomID, textclear, text string) (*RespSendEvent, error) {
+ return cli.SendMessageEvent(roomID, "m.room.message",
+ TextMessage{"m.text", textclear, "org.matrix.custom.html", text})
}
// SendImage sends an m.room.message event into the given room with a msgtype of m.image
@@ -490,7 +495,12 @@ func (cli *Client) SendVideo(roomID, body, url string) (*RespSendEvent, error) {
// See http://matrix.org/docs/spec/client_server/r0.2.0.html#m-notice
func (cli *Client) SendNotice(roomID, text string) (*RespSendEvent, error) {
return cli.SendMessageEvent(roomID, "m.room.message",
- TextMessage{"m.notice", text})
+ TextMessage{"m.notice", text, "", ""})
+}
+
+func (cli *Client) SendNoticeHTML(roomID, textclear, text string) (*RespSendEvent, error) {
+ return cli.SendMessageEvent(roomID, "m.room.message",
+ TextMessage{"m.notice", textclear, "org.matrix.custom.html", text})
}
// RedactEvent redacts the given event. See http://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-rooms-roomid-redact-eventid-txnid
diff --git a/vendor/github.com/matterbridge/gomatrix/events.go b/vendor/github.com/matterbridge/gomatrix/events.go
index 61f75372..d065cd72 100644
--- a/vendor/github.com/matterbridge/gomatrix/events.go
+++ b/vendor/github.com/matterbridge/gomatrix/events.go
@@ -41,8 +41,10 @@ func (event *Event) MessageType() (msgtype string, ok bool) {
// TextMessage is the contents of a Matrix formated message event.
type TextMessage struct {
- MsgType string `json:"msgtype"`
- Body string `json:"body"`
+ MsgType string `json:"msgtype"`
+ Body string `json:"body"`
+ Format string `json:"format,omitempty"`
+ FormattedBody string `json:"formatted_body,omitempty"`
}
// ImageInfo contains info about an image - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-image