X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAddress.pm;h=2c9c4395c02edbb86683573612f5b454115ce719;hb=refs%2Fheads%2Fmaster;hp=433b36ebb4ef4f38170d9ee6cb51972c12b9a6d3;hpb=69ae87044ca499aa401c73a9a1d764013539fb2d;p=public-inbox.git

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index 433b36eb..2c9c4395 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -1,30 +1,43 @@
-# Copyright (C) 2016-2019 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);
 
-sub xs_emails { map { $_->address() } parse_email_addresses($_[0]) }
+sub xs_emails {
+	grep { defined } map { $_->address() } parse_email_addresses($_[0])
+}
 
 sub xs_names {
-	map {
+	grep { defined } map {
 		my $n = $_->name;
-		$n = $_->user if $n eq $_->address;
+		my $addr = $_->address;
+		$n = $_->user if defined($addr) && $n eq $addr;
 		$n;
 	} parse_email_addresses($_[0]);
 }
 
+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]) ];
+}
+
 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;