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

Fix go 1.11 and go get compatibility

Browse Source
This commit is contained in:
Tulir Asokan
2019-05-12 17:34:47 +03:00
parent bedbc3d10a
commit 4bcdcd1ccd
5 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/messages/html/parser.go
View File

@@ -323,7 +323,7 @@ func (parser *htmlParser) singleNodeToEntity(node *html.Node) Entity {
switch node.Type {
case html.TextNode:
if !parser.keepLinebreak {
node.Data = strings.ReplaceAll(node.Data, "\n", "")
node.Data = strings.Replace(node.Data, "\n", "", -1)
}
if len(node.Data) == 0 {
return nil
@@ -385,7 +385,7 @@ const TabLength = 4
func Parse(room *rooms.Room, evt *mautrix.Event, senderDisplayname string) Entity {
htmlData := evt.Content.FormattedBody
if evt.Content.Format != mautrix.FormatHTML {
htmlData = strings.ReplaceAll(html.EscapeString(evt.Content.Body), "\n", "<br/>")
htmlData = strings.Replace(html.EscapeString(evt.Content.Body), "\n", "<br/>", -1)
}
htmlData = strings.Replace(htmlData, "\t", strings.Repeat(" ", TabLength), -1)

2
ui/messages/htmlmessage.go
View File

@@ -106,5 +106,5 @@ func (hw *HTMLMessage) String() string {
return fmt.Sprintf("&messages.HTMLMessage{\n" +
" Base=%s,\n" +
" Root=||\n%s\n" +
"}", strings.ReplaceAll(hw.BaseMessage.String(), "\n", "\n "), hw.Root.String())
"}", strings.Replace(hw.BaseMessage.String(), "\n", "\n ", -1), hw.Root.String())
}