From 52e44dc8f9e01678f309818c8ca2bc65b8285738 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 6 Dec 2016 23:15:02 +0000 Subject: Revert "linkify: implement Markdown link compatibility" This reverts commit 130d0c4e33c5c73dc69e270fc698735d49e0f159. --- lib/PublicInbox/Linkify.pm | 15 ++++----------- t/linkify.t | 9 --------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm index cc0f7e3a..ea7fd71f 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,22 +27,15 @@ sub new { bless {}, shift } sub linkify_1 { my ($self, $s) = @_; $s =~ s!$LINK_RE! - my $beg = $1 || ''; - my $url = $2; + my $url = $1; 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; + $end = $1; } # salt this, as this could be exploited to show @@ -52,7 +45,7 @@ sub linkify_1 { # only escape ampersands, others do not match LINK_RE $url =~ s/&/&/g; $self->{$key} = $url; - $beg . 'PI-LINK-'. $key . $end; + 'PI-LINK-'. $key . $end; !ge; $s; } diff --git a/t/linkify.t b/t/linkify.t index a794c785..49cbbd64 100644 --- a/t/linkify.t +++ b/t/linkify.t @@ -57,13 +57,4 @@ use PublicInbox::Linkify; is($s, qq(hello $u 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]($u)!, 'markdown compatible'); -} - done_testing(); -- cgit v1.2.3-24-ge0c7