user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] linkify: handle URLs in parenthesized statements
Date: Fri, 23 Jun 2017 22:47:08 +0000	[thread overview]
Message-ID: <20170623224708.13379-1-e@80x24.org> (raw)

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/&/&#38;/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


                 reply	other threads:[~2017-06-23 22:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170623224708.13379-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

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).