From 511e434efc1fe7df017d4f30234da001dc1fe50e Mon Sep 17 00:00:00 2001 From: yuin Date: Tue, 3 Dec 2019 13:31:57 +0900 Subject: [PATCH] Fixes #49 --- extension/_test/linkify.txt | 9 +++++++++ extension/linkify.go | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/extension/_test/linkify.txt b/extension/_test/linkify.txt index a936b68..01fd308 100644 --- a/extension/_test/linkify.txt +++ b/extension/_test/linkify.txt @@ -121,3 +121,12 @@ https://github.com#sun,mon //- - - - - - - - -//

https://github.com#sun,mon

//= = = = = = = = = = = = = = = = = = = = = = = =// + + + +12 +//- - - - - - - - -// +https://github.com/sunday's +//- - - - - - - - -// +

https://github.com/sunday's

+//= = = = = = = = = = = = = = = = = = = = = = = =// diff --git a/extension/linkify.go b/extension/linkify.go index 8adc4b1..b7bd9db 100644 --- a/extension/linkify.go +++ b/extension/linkify.go @@ -10,9 +10,9 @@ import ( "regexp" ) -var wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b(?:[-a-zA-Z0-9@:%_\+.~#?&//=\(\);,]*)`) +var wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b(?:[-a-zA-Z0-9@:%_\+.~#?&//=\(\);,'"]*)`) -var urlRegexp = regexp.MustCompile(`^(?:http|https|ftp):\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=\(\);,]*)`) +var urlRegexp = regexp.MustCompile(`^(?:http|https|ftp):\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=\(\);,'"]*)`) type linkifyParser struct { }