X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLinkify.pm;h=274f38209fa3a2c1a880b20a2c9c28a4a94e603a;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=4eddedd03646750783be13782bc8ce3cd63dced8;hpb=472d39de46603b180ab6e739e0b31ab7ef559870;p=public-inbox.git
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 4eddedd0..274f3820 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016 all contributors
+# Copyright (C) 2014-2018 all contributors
# License: AGPL-3.0+
# two-step linkification.
@@ -15,22 +15,34 @@ use warnings;
use Digest::SHA qw/sha1_hex/;
my $SALT = rand;
-my $LINK_RE = qr!\b((?:ftp|https?|nntp)://
+my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher)://
[\@:\w\.-]+/
- ?[\@\w\+\&\?\.\%\;/#=-]*)!x;
+ (?:[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.
- if ($url =~ s/(\.)\z// || $url =~ s/(;)\z//) {
+ # '.', ',' or ';' to denote the end of a statement;
+ # assume the intent was to end the statement/sentence
+ # in English
+ # 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
@@ -39,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) {
"$url";
} else {
@@ -59,7 +69,7 @@ sub linkify_2 {
$key;
}
!ge;
- $s;
+ $_[1];
}
1;