From 420fddb8b683637cc1fd39727896cac4a459c3b6 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 28 Oct 2019 10:45:22 +0000 Subject: mda: hoist out mda_filter_adjust It makes it easier to document the default -mda behavior is stricter than normal, including "public-inbox-learn ham" --- script/public-inbox-mda | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'script/public-inbox-mda') diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 3ff318c9..71c5d937 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -75,13 +75,19 @@ if ($spamc) { my $mime = PublicInbox::MIME->new(\$str); do_exit(0) unless $spam_ok; -my $fcfg = $dst->{filter} || ''; -# -mda defaults to the strict base filter -if ($fcfg eq '') { - $dst->{filter} = 'PublicInbox::Filter::Base'; -} elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove? - $dst->{filter} = 'PublicInbox::Filter::Mirror'; +# -mda defaults to the strict base filter which we won't use anywhere else +sub mda_filter_adjust ($) { + my ($ibx) = @_; + my $fcfg = $ibx->{filter} || ''; + if ($fcfg eq '') { + $ibx->{filter} = 'PublicInbox::Filter::Base'; + } elsif ($fcfg eq 'scrub') { # legacy alias, undocumented, remove? + $ibx->{filter} = 'PublicInbox::Filter::Mirror'; + } } + +mda_filter_adjust($dst); + my $filter = $dst->filter; my $ret = $filter->delivery($mime); if (ref($ret) && $ret->isa('Email::MIME')) { # filter altered message -- cgit v1.2.3-24-ge0c7