use Encode::MIME::Header;
use File::Path::Expand qw/expand_filename/;
use IPC::Run qw(run);
-use constant MDA => 'ssoma-mda';
-use PublicInbox;
+use PublicInbox::MDA;
use PublicInbox::Filter;
use PublicInbox::Config;
my $filter = Email::Filter->new(emergency => $emergency);
my $config = PublicInbox::Config->new;
-my $recipient = $ENV{RECIPIENT};
-defined $recipient or die "RECIPIENT not defined in ENV\n";
+my $recipient = $ENV{ORIGINAL_RECIPIENT};
+defined $recipient or die "ORIGINAL_RECIPIENT not defined in ENV\n";
my $dst = $config->lookup($recipient);
defined $dst or exit(1);
my $main_repo = $dst->{mainrepo} or exit(1);
my $filtered; # string dest
-if (PublicInbox->precheck($filter, $recipient) &&
+if (PublicInbox::MDA->precheck($filter, $recipient) &&
do_spamc($filter->simple, \$filtered)) {
# update our message with SA headers (in case our filter rejects it)
my $simple = Email::Simple->new($filtered);
# run spamc again on the HTML-free message
if (do_spamc($simple, \$filtered)) {
$simple = Email::Simple->new($filtered);
- set_list_headers($simple, $dst);
+ PublicInbox::MDA->set_list_headers($simple, $dst);
$filter->simple($simple);
- my $from = decode('MIME-Header', $filter->from);
- $from = encode("utf8", $from);
- my @from = Email::Address->parse($from);
- my $name = $from[0]->name;
- defined $name or $name = "";
- my $email = $from[0]->address;
- defined $email or $email = "";
+ my ($name, $email, $date) =
+ PublicInbox::MDA->author_info($simple);
local $ENV{GIT_AUTHOR_NAME} = $name;
local $ENV{GIT_AUTHOR_EMAIL} = $email;
- local $ENV{GIT_AUTHOR_DATE} = $simple->header("Date");
+ local $ENV{GIT_AUTHOR_DATE} = $date;
local $ENV{GIT_COMMITTER_EMAIL} = $recipient;
local $ENV{GIT_COMMITTER_NAME} = $dst->{listname};
- $filter->pipe(MDA, '-1', $main_repo);
+ $filter->pipe(PublicInbox::MDA->cmd, $main_repo);
}
}
}
return ($@ || $? || !defined($$out) || length($$out) == 0) ? 0 : 1;
}
-
-# RFC2919 and RFC2369
-sub set_list_headers {
- my ($simple, $dst) = @_;
- my $pa = "<$dst->{-primary_address}>";
- $simple->header_set("List-Id", $pa);
- $simple->header_set("List-Post", $pa);
-
- my $url = $dst->{url};
- if (defined $url) {
- $simple->header_set("List-Archive", "<$url>");
- $simple->header_set("List-Help", "<${url}help>");
- }
-}