Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parse HTML when editing messages. Fixes #301

Browse Source
This commit is contained in:
Tulir Asokan 2022-04-15 14:12:01 +03:00
parent 4136d6c6b0
commit 751a158fbf
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/room-view.go
View File

@ -33,6 +33,7 @@ import (
"maunium.net/go/mautrix" "maunium.net/go/mautrix"
"maunium.net/go/mautrix/crypto/attachment" "maunium.net/go/mautrix/crypto/attachment"
"maunium.net/go/mautrix/event" "maunium.net/go/mautrix/event"
"maunium.net/go/mautrix/format"
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
"maunium.net/go/mautrix/util/variationselector" "maunium.net/go/mautrix/util/variationselector"
@ -423,6 +424,18 @@ func (view *RoomView) SetTyping(users []id.UserID) {
} }
} }
var editHTMLParser = &format.HTMLParser{
PillConverter: func(displayname, mxid, eventID string, ctx format.Context) string {
if len(eventID) > 0 {
return fmt.Sprintf(`[%s](https://matrix.to/#/%s/%s)`, displayname, mxid, eventID)
} else {
return fmt.Sprintf(`[%s](https://matrix.to/#/%s)`, displayname, mxid)
}
},
Newline: "\n",
HorizontalLine: "\n---\n",
}
func (view *RoomView) SetEditing(evt *muksevt.Event) { func (view *RoomView) SetEditing(evt *muksevt.Event) {
if evt == nil { if evt == nil {
view.editing = nil view.editing = nil
@ -440,8 +453,14 @@ func (view *RoomView) SetEditing(evt *muksevt.Event) {
// This feels kind of dangerous, but I think it works // This feels kind of dangerous, but I think it works
msgContent = view.editing.Gomuks.Edits[len(view.editing.Gomuks.Edits)-1].Content.AsMessage().NewContent msgContent = view.editing.Gomuks.Edits[len(view.editing.Gomuks.Edits)-1].Content.AsMessage().NewContent
} }
// TODO this should parse HTML instead of just using the plaintext body
text := msgContent.Body text := msgContent.Body
if len(msgContent.FormattedBody) > 0 && (!view.config.Preferences.DisableMarkdown || !view.config.Preferences.DisableHTML) {
if view.config.Preferences.DisableMarkdown {
text = msgContent.FormattedBody
} else {
text = editHTMLParser.Parse(msgContent.FormattedBody, make(format.Context))
}
}
if msgContent.MsgType == event.MsgEmote { if msgContent.MsgType == event.MsgEmote {
text = "/me " + text text = "/me " + text
} }