* [PATCH] watch: watchspam affects all configured inboxes
@ 2017-01-04 10:51 7% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2017-01-04 10:51 UTC (permalink / raw)
To: meta
If a message is spam in one mailbox, it is spam in all others a
particular user/group will care about.
---
Documentation/public-inbox-config.pod | 3 ++-
lib/PublicInbox/WatchMaildir.pm | 22 +++++++++++++---------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/Documentation/public-inbox-config.pod b/Documentation/public-inbox-config.pod
index cfd6c93..78f12ba 100644
--- a/Documentation/public-inbox-config.pod
+++ b/Documentation/public-inbox-config.pod
@@ -105,7 +105,8 @@ Default: none
This may be set to C<spamc> to enable the use of SpamAssassin
L<spamc(1)> for filtering spam before it is imported into git
history. Other spam filtering backends may be supported in
-the future. This only affects L<public-inbox-watch(1)>.
+the future. This requires L<public-inbox-watch(1)>, but affects
+all configured public-inboxes in PI_CONFIG.
Default: none
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index c8ea3ed..b7c2d17 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -80,6 +80,7 @@ sub new {
mdmap => \%mdmap,
mdir => \@mdir,
mdre => $mdre,
+ config => $config,
importers => {},
}, $class;
}
@@ -99,15 +100,18 @@ sub _remove_spam {
$path =~ /:2,[A-R]*S[T-Z]*\z/i or return;
my $mime = _path_to_mime($path) or return;
_force_mid($mime);
- foreach my $inbox (values %{$self->{mdmap}}) {
- next unless ref $inbox;
- my $im = _importer_for($self, $inbox);
- $im->remove($mime);
- if (my $scrub = _scrubber_for($inbox)) {
- my $scrubbed = $scrub->scrub($mime) or next;
- $im->remove($scrubbed);
- }
- }
+ $self->{config}->each_inbox(sub {
+ my ($ibx) = @_;
+ eval {
+ my $im = _importer_for($self, $ibx);
+ $im->remove($mime);
+ if (my $scrub = _scrubber_for($ibx)) {
+ my $scrubbed = $scrub->scrub($mime) or return;
+ $im->remove($scrubbed);
+ }
+ };
+ warn "error removing spam at $path from $ibx->{name}\n" if $@;
+ })
}
# used to hash the relevant portions of a message when there are conflicts
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH] learn: scan all inboxes when learning spam
@ 2017-04-05 1:44 5% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2017-04-05 1:44 UTC (permalink / raw)
To: meta
This matches the behavior of the -watch daemon since
6d534038285ddd760709ba76ea007f9108200097
("watch: watchspam affects all configured inboxes")
---
script/public-inbox-learn | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/script/public-inbox-learn b/script/public-inbox-learn
index 38c8324..71aa50f 100755
--- a/script/public-inbox-learn
+++ b/script/public-inbox-learn
@@ -51,6 +51,18 @@ foreach my $h (qw(Cc To)) {
}
}
+if ($train eq 'spam') {
+ $pi_config->each_inbox(sub {
+ my ($ibx) = @_;
+ my $git = $ibx->git;
+ my $name = $ibx->{name};
+ my $addr = $ibx->{-primary_address};
+ my $im = PublicInbox::Import->new($git, $name, $addr, $ibx);
+ $im->remove($mime);
+ $im->done;
+ });
+}
+
require PublicInbox::MDA if $train eq "ham";
# n.b. message may be cross-posted to multiple public-inboxes
--
EW
^ permalink raw reply related [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2017-01-04 10:51 7% [PATCH] watch: watchspam affects all configured inboxes Eric Wong
2017-04-05 1:44 5% [PATCH] learn: scan all inboxes when learning spam Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).