linkify: do not capture trailing '.' or ';' in URLs

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

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 8f634f482828f64896ee7795e60f0267ee21ee02..4eddedd03646750783be13782bc8ce3cd63dced8 100644 (file)
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -25,6 +25,14 @@ sub linkify_1 {
        my ($self, $s) = @_;
        $s =~ s!$LINK_RE!
                my $url = $1;
+               my $end = '';
+
+               # it's fairly common to end URLs in messages with
+               # '.' or ';' to denote the end of a statement.
+               if ($url =~ s/(\.)\z// || $url =~ s/(;)\z//) {
+                       $end = $1;
+               }
+
                # salt this, as this could be exploited to show
                # links in the HTML which don't show up in the raw mail.
                my $key = sha1_hex($url . $SALT);
@@ -32,7 +40,7 @@ sub linkify_1 {
                # only escape ampersands, others do not match LINK_RE
                $url =~ s/&/&/g;
                $self->{$key} = $url;
-               'PI-LINK-'. $key;
+               'PI-LINK-'. $key . $end;
        !ge;
        $s;
 }