mda: allow configuring globally without spamc support

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 7ee29da54ebd5cf27f16ba32b2654fed87831df8..13dea168deb8d5e3a0e4604dd5694f4a865370d6 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -14,6 +14,7 @@ use PublicInbox::Spawn qw(spawn);
 use PublicInbox::InboxWritable;
 use File::Temp qw//;
 use PublicInbox::Filter::Base;
+use PublicInbox::Spamcheck;
 *REJECT = *PublicInbox::Filter::Base::REJECT;
 
 sub new {
@@ -40,19 +41,9 @@ sub new {
        }
 
        my $k = 'publicinboxwatch.spamcheck';
-       my $spamcheck = $config->{$k};
-       if ($spamcheck) {
-               if ($spamcheck eq 'spamc') {
-                       $spamcheck = 'PublicInbox::Spamcheck::Spamc';
-               }
-               if ($spamcheck =~ /::/) {
-                       eval "require $spamcheck";
-                       $spamcheck = _spamcheck_cb($spamcheck->new);
-               } else {
-                       warn "unsupported $k=$spamcheck\n";
-                       $spamcheck = undef;
-               }
-       }
+       my $default = undef;
+       my $spamcheck = PublicInbox::Spamcheck::get($config, $k, $default);
+       $spamcheck = _spamcheck_cb($spamcheck) if $spamcheck;
 
        # need to make all inboxes writable for spam removal:
        $config->each_inbox(sub { PublicInbox::InboxWritable->new($_[0]) });
@@ -126,7 +117,8 @@ sub _remove_spam {
                        my $im = _importer_for($self, $ibx);
                        $im->remove($mime, 'spam');
                        if (my $scrub = $ibx->filter) {
-                               my $scrubbed = $scrub->scrub($mime) or return;
+                               my $scrubbed = $scrub->scrub($mime, 1);
+                               $scrubbed or return;
                                $scrubbed == REJECT() and return;
                                $im->remove($scrubbed, 'spam');
                        }