Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make HTMLDisable work correct (matrix) #1716

Merged
merged 1 commit into from
Feb 6, 2022
Merged

Make HTMLDisable work correct (matrix) #1716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 60 additions & 31 deletions bridge/matrix/matrix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ type matrixUsername struct {

// SubTextMessage represents the new content of the message in edit messages.
type SubTextMessage struct {
MsgType string `json:"msgtype"`
Body string `json:"body"`
MsgType string `json:"msgtype"`
Body string `json:"body"`
FormattedBody string `json:"formatted_body,omitempty"`
Format string `json:"format,omitempty"`
}

// MessageRelation explains how the current message relates to a previous message.
Expand Down Expand Up @@ -151,7 +153,13 @@ func (b *Bmatrix) Send(msg config.Message) (string, error) {
m := matrix.TextMessage{
MsgType: "m.emote",
Body: username.plain + msg.Text,
FormattedBody: username.formatted + msg.Text,
FormattedBody: username.formatted + helper.ParseMarkdown(msg.Text),
Format: "org.matrix.custom.html",
}

if b.GetBool("HTMLDisable") {
m.Format = ""
m.FormattedBody = ""
}

msgID := ""
Expand Down Expand Up @@ -214,20 +222,29 @@ func (b *Bmatrix) Send(msg config.Message) (string, error) {

// Edit message if we have an ID
if msg.ID != "" {
rmsg := EditedMessage{TextMessage: matrix.TextMessage{
Body: username.plain + msg.Text,
MsgType: "m.text",
}}
if b.GetBool("HTMLDisable") {
rmsg.TextMessage.FormattedBody = username.formatted + "* " + msg.Text
} else {
rmsg.Format = "org.matrix.custom.html"
rmsg.TextMessage.FormattedBody = username.formatted + "* " + helper.ParseMarkdown(msg.Text)
rmsg := EditedMessage{
TextMessage: matrix.TextMessage{
Body: username.plain + msg.Text,
MsgType: "m.text",
Format: "org.matrix.custom.html",
FormattedBody: username.formatted + helper.ParseMarkdown(msg.Text),
},
}

rmsg.NewContent = SubTextMessage{
Body: rmsg.TextMessage.Body,
MsgType: "m.text",
Body: rmsg.TextMessage.Body,
FormattedBody: rmsg.TextMessage.FormattedBody,
Format: rmsg.TextMessage.Format,
MsgType: "m.text",
}

if b.GetBool("HTMLDisable") {
rmsg.TextMessage.Format = ""
rmsg.TextMessage.FormattedBody = ""
rmsg.NewContent.Format = ""
rmsg.NewContent.FormattedBody = ""
}

rmsg.RelatedTo = MessageRelation{
EventID: msg.ID,
Type: "m.replace",
Expand All @@ -251,33 +268,21 @@ func (b *Bmatrix) Send(msg config.Message) (string, error) {
MsgType: "m.notice",
Body: username.plain + msg.Text,
FormattedBody: username.formatted + msg.Text,
Format: "org.matrix.custom.html",
}

var (
resp *matrix.RespSendEvent
err error
)

err = b.retry(func() error {
resp, err = b.mc.SendMessageEvent(channel, "m.room.message", m)

return err
})
if err != nil {
return "", err
if b.GetBool("HTMLDisable") {
m.Format = ""
m.FormattedBody = ""
}

return resp.EventID, err
}

if b.GetBool("HTMLDisable") {
var (
resp *matrix.RespSendEvent
err error
)

err = b.retry(func() error {
resp, err = b.mc.SendText(channel, username.plain+msg.Text)
resp, err = b.mc.SendMessageEvent(channel, "m.room.message", m)

return err
})
Expand All @@ -294,9 +299,15 @@ func (b *Bmatrix) Send(msg config.Message) (string, error) {
MsgType: "m.text",
Body: username.plain + msg.Text,
FormattedBody: username.formatted + helper.ParseMarkdown(msg.Text),
Format: "org.matrix.custom.html",
},
}

if b.GetBool("HTMLDisable") {
m.TextMessage.Format = ""
m.TextMessage.FormattedBody = ""
}

m.RelatedTo = InReplyToRelation{
InReplyTo: InReplyToRelationContent{
EventID: msg.ParentID,
Expand All @@ -320,6 +331,24 @@ func (b *Bmatrix) Send(msg config.Message) (string, error) {
return resp.EventID, err
}

if b.GetBool("HTMLDisable") {
var (
resp *matrix.RespSendEvent
err error
)

err = b.retry(func() error {
resp, err = b.mc.SendText(channel, username.plain+msg.Text)

return err
})
if err != nil {
return "", err
}

return resp.EventID, err
}

// Post normal message with HTML support (eg riot.im)
var (
resp *matrix.RespSendEvent
Expand Down