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

Only linkify text if inline URLs are enabled

Browse Source
This commit is contained in:
Tulir Asokan
2022-04-15 23:44:59 +03:00
parent ebe3fcc33c
commit e08f23ba65
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,10 +383,13 @@ func (parser *htmlParser) tagNodeToEntity(node *html.Node) Entity {
var spaces = regexp.MustCompile("\\s+")
var links = regexp.MustCompile(`https?://\S+`)
func TextToEntity(text string, eventID id.EventID) Entity {
func TextToEntity(text string, eventID id.EventID, linkify bool) Entity {
if len(text) == 0 {
return nil
}
if !linkify {
return NewTextEntity(text)
}
indices := links.FindAllStringIndex(text, -1)
if len(indices) == 0 {
return NewTextEntity(text)
@ -418,7 +421,7 @@ func (parser *htmlParser) singleNodeToEntity(node *html.Node) Entity {
node.Data = strings.ReplaceAll(node.Data, "\n", "")
node.Data = spaces.ReplaceAllLiteralString(node.Data, " ")
}
return TextToEntity(node.Data, parser.evt.ID)
return TextToEntity(node.Data, parser.evt.ID, parser.prefs.InlineURLs)
case html.ElementNode:
parsed := parser.tagNodeToEntity(node)
if parsed != nil && !parsed.IsBlock() && parsed.IsEmpty() {