X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMDA.pm;h=f82194a347b867aa22d416b75576e3ac624527ee;hb=HEAD;hp=33696528f8c1468e8b2b05d597df4e84675c21cd;hpb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;p=public-inbox.git

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 33696528..f82194a3 100644
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,12 +1,12 @@
-# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # For the -mda script (mail delivery agent)
 package PublicInbox::MDA;
 use strict;
 use warnings;
-use Email::Simple;
 use PublicInbox::MsgTime;
+use PublicInbox::Address;
 use constant MAX_SIZE => 1024 * 500; # same as spamc default, should be tunable
 use constant MAX_MID_SIZE => 244; # max term size - 1 in Xapian
 
@@ -63,7 +63,7 @@ sub alias_specified {
 	} @address;
 
 	foreach my $line ($simple->header('Cc'), $simple->header('To')) {
-		my @addrs = ($line =~ /([^,<\s]+\@[^,>\s]+)/g);
+		my @addrs = PublicInbox::Address::emails($line);
 		foreach my $addr (@addrs) {
 			if ($ok{lc(__drop_plus($addr))}) {
 				return 1;
@@ -83,7 +83,7 @@ sub set_list_headers {
 }
 
 sub inboxes_for_list_id ($$) {
-	my ($klass, $config, $simple) = @_;
+	my ($klass, $pi_cfg, $simple) = @_;
 
 	# newer Email::Simple allows header_raw, as does Email::MIME:
 	my @list_ids = $simple->can('header_raw') ?
@@ -92,7 +92,7 @@ sub inboxes_for_list_id ($$) {
 	my @dests;
 	for my $list_id (@list_ids) {
 		$list_id =~ /<[ \t]*(.+)?[ \t]*>/ or next;
-		if (my $ibx = $config->lookup_list_id($1)) {
+		if (my $ibx = $pi_cfg->lookup_list_id($1)) {
 			push @dests, $ibx;
 		}
 	}