update copyrights for 2018

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

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 8e1728c71136c78de06af4d53603e54116496edb..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.
@@ -25,7 +25,7 @@ my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher)://
 sub new { bless {}, $_[0] }
 
 sub linkify_1 {
-       $_[1] =~ s!$LINK_RE!
+       $_[1] =~ s^$LINK_RE^
                my $beg = $1 || '';
                my $url = $2;
                my $end = '';
@@ -41,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
@@ -51,7 +53,7 @@ sub linkify_1 {
                $url =~ s/&/&#38;/g;
                $_[0]->{$key} = $url;
                $beg . 'PI-LINK-'. $key . $end;
-       !ge;
+       ^ge;
        $_[1];
 }