X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAddress.pm;h=2c9c4395c02edbb86683573612f5b454115ce719;hb=HEAD;hp=f334adeac02d0b797d5d29c715a0ec49da049c48;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;p=public-inbox.git

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index f334adea..2c9c4395 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -1,27 +1,43 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2021 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;
+use v5.10.1;
+use parent 'Exporter';
+our @EXPORT_OK = qw(pairs);
 
-# 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 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 emails {
-	($_[0] =~ /([\w\.\+=\-]+\@[\w\.\-]+)>?\s*(?:\(.*?\))?(?:,\s*|\z)/g)
+sub xs_pairs { # for JMAP, RFC 8621 section 4.1.2.3
+	[ map { # LHS (name) may be undef
+		[ $_->phrase // $_->comment, $_->address ]
+	} parse_email_addresses($_[0]) ];
 }
 
-sub names {
-	map {
-		tr/\r\n\t/ /;
-		s/\s*<([^<]+)\z//;
-		my $e = $1;
-		s/\A['"\s]*//;
-		s/['"\s]*\z//;
-		$e = $_ =~ /\S/ ? $_ : $e;
-		$e =~ s/\@\S+\z//;
-		$e;
-	} split(/\@+[\w\.\-]+>?\s*(?:\(.*?\))?(?:,\s*|\z)/, $_[0]);
+eval {
+	require Email::Address::XS;
+	Email::Address::XS->import(qw(parse_email_addresses));
+	*emails = \&xs_emails;
+	*names = \&xs_names;
+	*pairs = \&xs_pairs;
+};
+
+if ($@) {
+	require PublicInbox::AddressPP;
+	*emails = \&PublicInbox::AddressPP::emails;
+	*names = \&PublicInbox::AddressPP::names;
+	*pairs = \&PublicInbox::AddressPP::pairs;
 }
 
 1;