2 files changed, 32 insertions, 4 deletions

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index ea7fd71f..acd2a47e 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,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;
 }
diff --git a/t/linkify.t b/t/linkify.t
index 49cbbd64..99acf17d 100644
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -57,4 +57,26 @@ use PublicInbox::Linkify;
         is($s, qq(hello <a\nhref="$u">$u</a> world), "root + fragment");
 }
 
+# Markdown compatibility
+{
+        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');
+
+        $s = qq![markdown]($u "title")!;
+        $s = $l->linkify_1($s);
+        $s = $l->linkify_2($s);
+        is($s, qq![markdown](<a\nhref="$u">$u</a> "title")!,
+                'Markdown title compatible');
+
+        $s = qq![markdown]($u).!;
+        $s = $l->linkify_1($s);
+        $s = $l->linkify_2($s);
+        is($s, qq![markdown](<a\nhref="$u">$u</a>).!,
+                'Markdown-compatible end of sentence');
+}
+
 done_testing();