-# Copyright (C) 2017-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2017-2019 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# Filter for lists.ruby-lang.org trailers
use base qw(PublicInbox::Filter::Base);
use strict;
use warnings;
+use PublicInbox::MID qw(mids);
my $l1 = qr/Unsubscribe:\s
<mailto:ruby-\w+-request\@ruby-lang\.org\?subject=unsubscribe>/x;
$altid ||= $ibx->{altid}->[0];
}
if ($altid) {
- require PublicInbox::MID; # mid_clean
require PublicInbox::AltId;
$self->{-altid} = PublicInbox::AltId->new($ibx, $altid, 1);
}
}
sub scrub {
- my ($self, $mime) = @_;
+ my ($self, $mime, $for_remove) = @_;
# no msg_iter here, that is only for read-only access
$mime->walk_parts(sub {
my ($part) = $_[0];
}
});
my $altid = $self->{-altid};
- if ($altid) {
+ if ($altid && !$for_remove) {
my $hdr = $mime->header_obj;
- my $mid = $hdr->header_raw('Message-ID');
- unless (defined $mid) {
- return $self->REJECT('Message-Id missing');
+ my $mids = mids($hdr);
+ return $self->REJECT('Message-ID missing') unless (@$mids);
+ my @v = $hdr->header_raw('X-Mail-Count');
+ my $n;
+ foreach (@v) {
+ /\A\s*([0-9]+)\s*\z/ or next;
+ $n = $1;
+ last;
}
- my $n = $hdr->header_raw('X-Mail-Count');
- if (!defined($n) || $n !~ /\A\s*\d+\s*\z/) {
+ unless (defined $n) {
return $self->REJECT('X-Mail-Count not numeric');
}
- $mid = PublicInbox::MID::mid_clean($mid);
- $altid->{mm_alt}->mid_set($n, $mid);
+ foreach my $mid (@$mids) {
+ my $r = $altid->mm_alt->mid_set($n, $mid);
+ next if $r == 0;
+ last;
+ }
}
$self->ACCEPT($mime);
}