mda: hoist out List-ID handling and reuse in -learn

[public-inbox.git] / script / public-inbox-mda

diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 4e6e04e2174ebd9ab64d815df691c68294bae99f..3ff318c916007f2f19751b51a241ecb22fca2819 100755 (executable)
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -5,7 +5,8 @@
 # Mail delivery agent for public-inbox, run from your MTA upon mail delivery
 use strict;
 use warnings;
-my $usage = 'public-inbox-mda < rfc2822_message';
+my $usage = 'public-inbox-mda [OPTIONS] < rfc2822_message';
+my $precheck = grep(/\A--no-precheck\z/, @ARGV) ? 0 : 1;
 my ($ems, $emm);
 
 sub do_exit {
@@ -36,15 +37,25 @@ my $config = PublicInbox::Config->new;
 my $key = 'publicinboxmda.spamcheck';
 my $default = 'PublicInbox::Spamcheck::Spamc';
 my $spamc = PublicInbox::Spamcheck::get($config, $key, $default);
+my $dst;
 my $recipient = $ENV{ORIGINAL_RECIPIENT};
-defined $recipient or die "ORIGINAL_RECIPIENT not defined in ENV\n";
-my $dst = $config->lookup($recipient); # first check
-defined $dst or do_exit(67); # EX_NOUSER 5.1.1 user unknown
-$dst->{mainrepo} or do_exit(67);
+if (defined $recipient) {
+       $dst = $config->lookup($recipient); # first check
+}
+if (!defined $dst) {
+       $dst = PublicInbox::MDA->inbox_for_list_id($config, $simple);
+       if (!defined $dst && !defined $recipient) {
+               die "ORIGINAL_RECIPIENT not defined in ENV\n";
+       }
+       defined $dst or do_exit(67); # EX_NOUSER 5.1.1 user unknown
+}
+$dst->{inboxdir} or do_exit(67);
 $dst = PublicInbox::InboxWritable->new($dst);
 
 # pre-check, MDA has stricter rules than an importer might;
-do_exit(0) unless PublicInbox::MDA->precheck($simple, $dst->{address});
+if ($precheck && !PublicInbox::MDA->precheck($simple, $dst->{address})) {
+       do_exit(0);
+}
 $simple = undef;
 my $spam_ok;
 if ($spamc) {