linkify: implement Markdown link compatibility (again)

[public-inbox.git] / lib / PublicInbox / Linkify.pm

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index ea7fd71f13ca6d7f8a0909b271be95a03be1b2aa..acd2a47e8a78349e96ebe00d189e4d23a23bbe37 100644 (file)
--- 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,14 +27,20 @@ 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 = '';
 
                # 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//) {
+               # Markdown compatibility:
+               if ($beg eq '(') {
+                       if ($url =~ s/(\)[\.,;]?)\z//) {
+                               $end = $1;
+                       }
+               } elsif ($url =~ s/([\.,;])\z//) {
                        $end = $1;
                }
 
@@ -45,7 +51,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;
 }