X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAddress.pm;h=f413c2f636b9af55dc815afda6936ceda5e05a28;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=a58d1efff9e38ea9071c9d96e4a4bec0d664e9d7;hpb=01d25810ec9baf643e2a278a0fefdf857bfd3883;p=public-inbox.git

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index a58d1eff..f413c2f6 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -1,38 +1,33 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 package PublicInbox::Address;
 use strict;
 use warnings;
 
-# very loose regexes, here.  We don't need RFC-compliance,
-# just enough to make thing sanely displayable and pass to git
+sub xs_emails {
+	grep { defined } map { $_->address() } parse_email_addresses($_[0])
+}
 
-sub emails {
-	($_[0] =~ /([\w\.\+=\?"\(\)\-!#\$%&'\*\/\^\`\|\{\}~]+\@[\w\.\-\(\)]+)
-		(?:\s[^>]*)?>?\s*(?:\(.*?\))?(?:,\s*|\z)/gx)
+sub xs_names {
+	grep { defined } map {
+		my $n = $_->name;
+		my $addr = $_->address;
+		$n = $_->user if defined($addr) && $n eq $addr;
+		$n;
+	} parse_email_addresses($_[0]);
 }
 
-sub names {
-	my @p = split(/<?([^@<>]+)\@[\w\.\-]+>?\s*(\(.*?\))?(?:,\s*|\z)/,
-			$_[0]);
-	my @ret;
-	for (my $i = 0; $i <= $#p;) {
-		my $phrase = $p[$i++];
-		$phrase =~ tr/\r\n\t / /s;
-		$phrase =~ s/\A['"\s]*//;
-		$phrase =~ s/['"\s]*\z//;
-		my $user = $p[$i++] // '';
-		my $comment = $p[$i++] // '';
-		if ($phrase =~ /\S/) {
-			$phrase =~ s/\@\S+\z//;
-			push @ret, $phrase;
-		} elsif ($comment =~ /\A\((.*?)\)\z/) {
-			push @ret, $1;
-		} else {
-			push @ret, $user;
-		}
-	}
-	@ret;
+eval {
+	require Email::Address::XS;
+	Email::Address::XS->import(qw(parse_email_addresses));
+	*emails = \&xs_emails;
+	*names = \&xs_names;
+};
+
+if ($@) {
+	require PublicInbox::AddressPP;
+	*emails = \&PublicInbox::AddressPP::emails;
+	*names = \&PublicInbox::AddressPP::names;
 }
 
 1;