X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLinkify.pm;h=93c468fe74839c6d2a0e818996e8a00680a70464;hb=dfdaf74a2ab6d694315d8f636e3771a7a7934f3f;hp=ea7fd71f13ca6d7f8a0909b271be95a03be1b2aa;hpb=dfe55f5ee5bd6e3a12d933a6570eb94f294d1c54;p=public-inbox.git

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index ea7fd71f..93c468fe 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -15,27 +15,34 @@ 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\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)?
 		 (?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)?
 		 )}xi;
 
-sub new { bless {}, shift }
+sub new { bless {}, $_[0] }
 
 sub linkify_1 {
-	my ($self, $s) = @_;
-	$s =~ s!$LINK_RE!
-		my $url = $1;
+	$_[1] =~ s^$LINK_RE^
+		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;
+		} elsif ($url !~ /\(/ && $url =~ s/\)\z//) {
+			$end = ')';
 		}
 
 		# salt this, as this could be exploited to show
@@ -44,19 +51,17 @@ sub linkify_1 {
 
 		# only escape ampersands, others do not match LINK_RE
 		$url =~ s/&/&/g;
-		$self->{$key} = $url;
-		'PI-LINK-'. $key . $end;
-	!ge;
-	$s;
+		$_[0]->{$key} = $url;
+		$beg . 'PI-LINK-'. $key . $end;
+	^ge;
+	$_[1];
 }
 
 sub linkify_2 {
-	my ($self, $s) = @_;
-
 	# Added "PI-LINK-" prefix to avoid false-positives on git commits
-	$s =~ s!\bPI-LINK-([a-f0-9]{40})\b!
+	$_[1] =~ s!\bPI-LINK-([a-f0-9]{40})\b!
 		my $key = $1;
-		my $url = $self->{$key};
+		my $url = $_[0]->{$key};
 		if (defined $url) {
 			"<a\nhref=\"$url\">$url</a>";
 		} else {
@@ -64,7 +69,7 @@ sub linkify_2 {
 			$key;
 		}
 	!ge;
-	$s;
+	$_[1];
 }
 
 1;