update copyrights for 2018

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

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index acd2a47e8a78349e96ebe00d189e4d23a23bbe37..274f38209fa3a2c1a880b20a2c9c28a4a94e603a 100644 (file)
--- 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,11 +22,10 @@ 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 = '';
@@ -42,6 +41,8 @@ sub linkify_1 {
                        }
                } elsif ($url =~ s/([\.,;])\z//) {
                        $end = $1;
+               } elsif ($url !~ /\(/ && $url =~ s/\)\z//) {
+                       $end = ')';
                }
 
                # salt this, as this could be exploited to show
@@ -50,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 {
@@ -70,7 +69,7 @@ sub linkify_2 {
                        $key;
                }
        !ge;
-       $s;
+       $_[1];
 }
 
 1;