diff options
| -rw-r--r-- | lib/PublicInbox/Linkify.pm | 15 | ||||
| -rw-r--r-- | t/linkify.t | 9 |
2 files changed, 20 insertions, 4 deletions
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm index ea7fd71f..cc0f7e3a 100644 --- a/lib/PublicInbox/Linkify.pm +++ b/lib/PublicInbox/Linkify.pm @@ -15,7 +15,7 @@ use warnings; use Digest::SHA qw/sha1_hex/; my $SALT = rand; -my $LINK_RE = qr{\b((?:ftps?|https?|nntps?|gopher):// +my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher):// [\@:\w\.-]+/ (?:[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]*) (?:\?[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)? @@ -27,15 +27,22 @@ sub new { bless {}, shift } sub linkify_1 { my ($self, $s) = @_; $s =~ s!$LINK_RE! - my $url = $1; + my $beg = $1 || ''; + my $url = $2; my $end = ''; + # Markdown compatibility: + if ($beg eq '(') { + $url =~ s/\)\z//; + $end = ')'; + } + # it's fairly common to end URLs in messages with # '.', ',' or ';' to denote the end of a statement; # assume the intent was to end the statement/sentence # in English if ($url =~ s/([\.,;])\z//) { - $end = $1; + $end = $1 . $end; } # salt this, as this could be exploited to show @@ -45,7 +52,7 @@ sub linkify_1 { # only escape ampersands, others do not match LINK_RE $url =~ s/&/&/g; $self->{$key} = $url; - 'PI-LINK-'. $key . $end; + $beg . 'PI-LINK-'. $key . $end; !ge; $s; } diff --git a/t/linkify.t b/t/linkify.t index 49cbbd64..a794c785 100644 --- a/t/linkify.t +++ b/t/linkify.t @@ -57,4 +57,13 @@ use PublicInbox::Linkify; is($s, qq(hello <a\nhref="$u">$u</a> world), "root + fragment"); } +{ + my $l = PublicInbox::Linkify->new; + my $u = 'http://example.com/'; + my $s = "[markdown]($u)"; + $s = $l->linkify_1($s); + $s = $l->linkify_2($s); + is($s, qq![markdown](<a\nhref="$u">$u</a>)!, 'markdown compatible'); +} + done_testing(); |