rename {pi_config} fields to {pi_cfg}

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

diff --git a/lib/PublicInbox/MDA.pm b/lib/PublicInbox/MDA.pm
index 9cafda13997f68229d8f6f4f0b1dc34ce4bc3b93..0377a87771a800550eadae875606c9a6fc06d9ef 100644 (file)
--- a/lib/PublicInbox/MDA.pm
+++ b/lib/PublicInbox/MDA.pm
@@ -1,12 +1,12 @@
-# Copyright (C) 2013-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2020 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 Date::Parse qw(strptime);
+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
 
@@ -51,8 +51,7 @@ sub usable_str {
 }
 
 sub usable_date {
-       my @t = eval { strptime(@_) };
-       scalar @t;
+       defined(eval { PublicInbox::MsgTime::str2date_zone($_[0]) });
 }
 
 sub alias_specified {
@@ -64,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,4 +82,25 @@ sub set_list_headers {
        }
 }
 
+sub inboxes_for_list_id ($$) {
+       my ($klass, $pi_cfg, $simple) = @_;
+
+       # newer Email::Simple allows header_raw, as does Email::MIME:
+       my @list_ids = $simple->can('header_raw') ?
+                       $simple->header_raw('List-Id') :
+                       $simple->header('List-Id');
+       my @dests;
+       for my $list_id (@list_ids) {
+               $list_id =~ /<[ \t]*(.+)?[ \t]*>/ or next;
+               if (my $ibx = $pi_cfg->lookup_list_id($1)) {
+                       push @dests, $ibx;
+               }
+       }
+       if (scalar(@list_ids) > 1) {
+               warn "W: multiple List-IDs in message:\n";
+               warn "W: List-ID: $_\n" for @list_ids
+       }
+       \@dests;
+}
+
 1;