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

Use xurls instead of custom regex for finding links

Browse Source
This commit is contained in:
Tulir Asokan
2022-04-16 19:26:24 +03:00
parent a8660c7137
commit b3e989ee0f
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import (
"github.com/alecthomas/chroma/styles"
"github.com/lucasb-eyer/go-colorful"
"golang.org/x/net/html"
"mvdan.cc/xurls/v2"
"go.mau.fi/tcell"
@ -386,7 +387,6 @@ 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, linkify bool) Entity {
if len(text) == 0 {
@ -395,7 +395,7 @@ func TextToEntity(text string, eventID id.EventID, linkify bool) Entity {
if !linkify {
return NewTextEntity(text)
}
indices := links.FindAllStringIndex(text, -1)
indices := xurls.Strict().FindAllStringIndex(text, -1)
if len(indices) == 0 {
return NewTextEntity(text)
}