]> Sergey Matveev's repositories - public-inbox.git/blobdiff - lib/PublicInbox/Address.pm
No ext_urls
[public-inbox.git] / lib / PublicInbox / Address.pm
index 548f417cae91e25ff5ddc6d1ee031d290129ef73..2c9c4395c02edbb86683573612f5b454115ce719 100644 (file)
@@ -1,28 +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*(?:\(.*?\))?(?:,\s*|\z)/gx)
+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;