(?:\#[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;
}
# salt this, as this could be exploited to show
# only escape ampersands, others do not match LINK_RE
$url =~ s/&/&/g;
- $self->{$key} = $url;
+ $_[0]->{$key} = $url;
$beg . 'PI-LINK-'. $key . $end;
!ge;
- $s;
+ $_[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 {
$key;
}
!ge;
- $s;
+ $_[1];
}
1;