]> Sergey Matveev's repositories - public-inbox.git/commitdiff
watchmaildir: deal with rejected (100) messages
authorEric Wong <e@80x24.org>
Fri, 23 Jun 2017 00:47:23 +0000 (00:47 +0000)
committerEric Wong <e@80x24.org>
Fri, 23 Jun 2017 00:47:23 +0000 (00:47 +0000)
The RubyLang filter is strict about what messages it rejects, so
the spam learning path will not auto-train or remove messages
missing X-Mail-Count headers.

lib/PublicInbox/WatchMaildir.pm

index 8588f16c836a449366c0be375fea745c3c1651ed..c15e138436cd8964e061a40f725212ef425103af 100644 (file)
@@ -108,6 +108,7 @@ sub _remove_spam {
                        $im->remove($mime);
                        if (my $scrub = _scrubber_for($ibx)) {
                                my $scrubbed = $scrub->scrub($mime) or return;
+                               $scrubbed == 100 and return;
                                $im->remove($scrubbed);
                        }
                };
@@ -169,7 +170,9 @@ sub _try_path {
                return unless ($v && $v =~ $wm->[1]);
        }
        if (my $scrub = _scrubber_for($inbox)) {
-               $mime = $scrub->scrub($mime) or return;
+               my $ret = $scrub->scrub($mime) or return;
+               $ret == 100 and return;
+               $mime = $ret;
        }
 
        _force_mid($mime);