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 ce2c870f89edcd353d263d1c8fed28a0d08ede1f..f82194a347b867aa22d416b75576e3ac624527ee 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-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 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,19 +82,25 @@ sub set_list_headers {
        }
 }
 
-# TODO: deal with multiple List-ID headers?
-sub inbox_for_list_id ($$) {
-       my ($klass, $config, $simple) = @_;
+sub inboxes_for_list_id ($$) {
+       my ($klass, $pi_cfg, $simple) = @_;
 
        # newer Email::Simple allows header_raw, as does Email::MIME:
-       my $list_id = $simple->can('header_raw') ?
+       my @list_ids = $simple->can('header_raw') ?
                        $simple->header_raw('List-Id') :
                        $simple->header('List-Id');
-       my $ibx;
-       if (defined $list_id && $list_id =~ /<[ \t]*(.+)?[ \t]*>/) {
-               $ibx = $config->lookup_list_id($1);
+       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
        }
-       $ibx;
+       \@dests;
 }
 
 1;