mda: hoist out List-ID handling and reuse in -learn

[public-inbox.git] / script / public-inbox-learn

diff --git a/script/public-inbox-learn b/script/public-inbox-learn
old mode 100755 (executable)
new mode 100644 (file)
index 56739f8..79f3ead
--- a/script/public-inbox-learn
+++ b/script/public-inbox-learn
@@ -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,10 +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
+               next if $seen{"$ibx"}++;
                remove_or_add($ibx, $train, $addr);
        }
+       my $ibx = PublicInbox::MDA->inbox_for_list_id($pi_config, $mime);
+       if ($ibx && !$seen{"$ibx"}) {
+               remove_or_add($ibx, $train, $ibx->{-primary_address});
+       }
 }
 
 if ($err) {