-# 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 {
- 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;
+};
+
+if ($@) {
+ require PublicInbox::AddressPP;
+ *emails = \&PublicInbox::AddressPP::emails;
+ *names = \&PublicInbox::AddressPP::names;
}
1;