imap+nntp: share COMPRESS implementation

[public-inbox.git] / lib / PublicInbox / MDA.pm

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 57b436b984e354c19550697d3eb766ac519a97e9..f82194a347b867aa22d416b75576e3ac624527ee 100644 (file)
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,4 +1,4 @@
-# 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)
@@ -6,6 +6,7 @@ package PublicInbox::MDA;
 use strict;
 use warnings;
 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
 
@@ -62,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;
@@ -82,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') ?
@@ -91,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;
                }
        }