X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLinkify.pm;h=274f38209fa3a2c1a880b20a2c9c28a4a94e603a;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=cc0f7e3a5a3a775d3744100a0e67e3f71a11a3db;hpb=130d0c4e33c5c73dc69e270fc698735d49e0f159;p=public-inbox.git

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index cc0f7e3a..274f3820 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # two-step linkification.
@@ -22,27 +22,27 @@ my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher)://
 		 (?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)?
 		 )}xi;
 
-sub new { bless {}, shift }
+sub new { bless {}, $_[0] }
 
 sub linkify_1 {
-	my ($self, $s) = @_;
-	$s =~ s!$LINK_RE!
+	$_[1] =~ s^$LINK_RE^
 		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;
+		# 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
@@ -51,19 +51,17 @@ sub linkify_1 {
 
 		# only escape ampersands, others do not match LINK_RE
 		$url =~ s/&/&#38;/g;
-		$self->{$key} = $url;
+		$_[0]->{$key} = $url;
 		$beg . 'PI-LINK-'. $key . $end;
-	!ge;
-	$s;
+	^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 {
@@ -71,7 +69,7 @@ sub linkify_2 {
 			$key;
 		}
 	!ge;
-	$s;
+	$_[1];
 }
 
 1;