apps/opensaps
2
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Proper JSON marshaling for Matrix pusher.

Browse Source
This commit is contained in:
Stanislav Nikitin 2017-09-13 16:02:56 +05:00
parent af769b3039
commit d0408878e1
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pushers/matrix/matrixconnection.go
View File

@ -40,6 +40,13 @@ const (
letterIdxMask = 1<<letterIdxBits - 1 // All 1-bits, as many as letterIdxBits letterIdxMask = 1<<letterIdxBits - 1 // All 1-bits, as many as letterIdxBits
) )
type MatrixMessage struct {
MsgType string `json:"msgtype"`
Body string `json:"body"`
Format string `json:"format"`
FormattedBody string `json:"formatted_body"`
}
type MatrixConnection struct { type MatrixConnection struct {
// API root for connection. // API root for connection.
api_root string api_root string
@ -291,7 +298,19 @@ func (mxc *MatrixConnection) SendMessage(message string) {
// We should send notices as it is preferred behaviour for bots and // We should send notices as it is preferred behaviour for bots and
// appservices. // appservices.
//msgStr := fmt.Sprintf(`{"msgtype": "m.text", "body": "%s", "format": "org.matrix.custom.html", "formatted_body": "%s"}`, message, message) //msgStr := fmt.Sprintf(`{"msgtype": "m.text", "body": "%s", "format": "org.matrix.custom.html", "formatted_body": "%s"}`, message, message)
msgStr := fmt.Sprintf(`{"msgtype": "m.notice", "body": "%s", "format": "org.matrix.custom.html", "formatted_body": "%s"}`, message, message) msg := MatrixMessage{}
msg.MsgType = "m.notice"
msg.Body = message
msg.Format = "org.matrix.custom.html"
msg.FormattedBody = message
msgBytes, err := json.Marshal(&msg)
if err != nil {
c.Log.Errorln("Failed to marshal message into JSON:", err.Error())
return
}
msgStr := string(msgBytes)
reply, err := mxc.doPutRequest("/rooms/" + mxc.room_id + "/send/m.room.message/" + mxc.generateTnxId(), msgStr) reply, err := mxc.doPutRequest("/rooms/" + mxc.room_id + "/send/m.room.message/" + mxc.generateTnxId(), msgStr)
if err != nil { if err != nil {
c.Log.Fatalf("Failed to send message to room '%s' (conn: '%s'): %s", mxc.room_id, mxc.conn_name, err.Error()) c.Log.Fatalf("Failed to send message to room '%s' (conn: '%s'): %s", mxc.room_id, mxc.conn_name, err.Error())