user/dev discussion of public-inbox itself
 help / Atom feed
* [PATCH] watch: watchspam affects all configured inboxes
@ 2017-01-04 10:51 Eric Wong
  0 siblings, 0 replies; 1+ messages in thread
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	[flat|threaded] 1+ messages in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-04 10:51 [PATCH] watch: watchspam affects all configured inboxes Eric Wong

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox