Merge remote-tracking branch 'origin/email-simple-mem' into master

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 84080ba958f0dfd629743834761a87f82f6cbc9e..a76bf06e629db1c5b5381ee04e038fd48b970790 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -121,7 +121,7 @@ sub _remove_spam {
                eval {
                        my $im = _importer_for($self, $ibx);
                        $im->remove($mime, 'spam');
-                       if (my $scrub = $ibx->filter) {
+                       if (my $scrub = $ibx->filter($im)) {
                                my $scrubbed = $scrub->scrub($mime, 1);
                                $scrubbed or return;
                                $scrubbed == REJECT() and return;
@@ -150,6 +150,12 @@ sub _try_path {
        if (!ref($inboxes) && $inboxes eq 'watchspam') {
                return _remove_spam($self, $path);
        }
+
+       my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
+       local $SIG{__WARN__} = sub {
+               $warn_cb->("path: $path\n");
+               $warn_cb->(@_);
+       };
        foreach my $ibx (@$inboxes) {
                my $mime = _path_to_mime($path) or next;
                my $im = _importer_for($self, $ibx);
@@ -159,7 +165,8 @@ sub _try_path {
                        my $v = $mime->header_obj->header_raw($wm->[0]);
                        next unless ($v && $v =~ $wm->[1]);
                }
-               if (my $scrub = $ibx->filter) {
+
+               if (my $scrub = $ibx->filter($im)) {
                        my $ret = $scrub->scrub($mime) or next;
                        $ret == REJECT() and next;
                        $mime = $ret;