unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
* [PATCH] linkify: handle URLs in parenthesized statements
@ 2017-06-23 22:47 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2017-06-23 22:47 UTC (permalink / raw)
  To: meta

Sometimes, URLs exist at the end of parethesized statements,
and we shouldn't unnecessarily capture that.

(example: https://public-inbox.org/ruby-core/20170623032722.GA8124@dcvr/)
---
 lib/PublicInbox/Linkify.pm |  6 ++++--
 t/linkify.t                | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 8e1728c..93c468f 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -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/&/&/g;
 		$_[0]->{$key} = $url;
 		$beg . 'PI-LINK-'. $key . $end;
-	!ge;
+	^ge;
 	$_[1];
 }
 
diff --git a/t/linkify.t b/t/linkify.t
index 99acf17..041c15c 100644
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -14,6 +14,16 @@ use PublicInbox::Linkify;
 	is($s, qq(<a\nhref="$u">$u</a>.), 'trailing period not in URL');
 }
 
+# handle URLs in parenthesized statements
+{
+	my $l = PublicInbox::Linkify->new;
+	my $u = 'http://example.com/';
+	my $s = "(see: $u)";
+	$s = $l->linkify_1($s);
+	$s = $l->linkify_2($s);
+	is($s, qq{(see: <a\nhref="$u">$u</a>)}, 'trailing ) not in URL');
+}
+
 {
 	my $l = PublicInbox::Linkify->new;
 	my $u = 'http://example.com/url-with-trailing-semicolon';
-- 
EW


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-06-23 22:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-23 22:47 [PATCH] linkify: handle URLs in parenthesized statements Eric Wong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).