X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-learn;h=93aece2e66b6c0d0fecf1d718070e5e213099f7a;hb=a65ebdc3a1f064bab0cddf64b34caad49f1c4c9c;hp=56739f88d720bfc12d344d6e4a2c68b73a28926e;hpb=29beb70160d15ffe46cb07e9d9468acfcda34db7;p=public-inbox.git

diff --git a/script/public-inbox-learn b/script/public-inbox-learn
old mode 100755
new mode 100644
index 56739f88..93aece2e
--- a/script/public-inbox-learn
+++ b/script/public-inbox-learn
@@ -39,8 +39,8 @@ my $mime = PublicInbox::MIME->new(eval {
 	$data
 });
 
-sub remove_or_add ($$$) {
-	my ($ibx, $train, $addr) = @_;
+sub remove_or_add ($$$$) {
+	my ($ibx, $train, $mime, $addr) = @_;
 
 	# We do not touch GIT_COMMITTER_* env here so we can track
 	# who trained the message.
@@ -77,7 +77,7 @@ if ($train eq 'spam') {
 		$im->done;
 	});
 } else {
-	require PublicInbox::MDA if $train eq "ham";
+	require PublicInbox::MDA;
 
 	# get all recipients
 	my %dests; # address => <PublicInbox::Inbox|0(false)>
@@ -89,9 +89,16 @@ if ($train eq 'spam') {
 	}
 
 	# n.b. message may be cross-posted to multiple public-inboxes
+	my %seen;
 	while (my ($addr, $ibx) = each %dests) {
 		next unless ref($ibx); # $ibx may be 0
-		remove_or_add($ibx, $train, $addr);
+		next if $seen{"$ibx"}++;
+		remove_or_add($ibx, $train, $mime, $addr);
+	}
+	my $dests = PublicInbox::MDA->inboxes_for_list_id($pi_config, $mime);
+	for my $ibx (@$dests) {
+		next if !$seen{"$ibx"}++;
+		remove_or_add($ibx, $train, $mime, $ibx->{-primary_address});
 	}
 }