X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFilter%2FRubyLang.pm;h=a65a59716f9affa7b6befacf1eb04a5383ae5f01;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=5240e8df22ada380434cdb76a871fd27fd3dd79f;hpb=a141cefa8323bbdc2a5c83127cb9eec3f58dc005;p=public-inbox.git

diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm
index 5240e8df..a65a5971 100644
--- a/lib/PublicInbox/Filter/RubyLang.pm
+++ b/lib/PublicInbox/Filter/RubyLang.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 all contributors <meta@public-inbox.org>
+# Copyright (C) 2017-2020 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
@@ -6,6 +6,7 @@ package PublicInbox::Filter::RubyLang;
 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;
@@ -21,7 +22,6 @@ sub new {
 		$altid ||= $ibx->{altid}->[0];
 	}
 	if ($altid) {
-		require PublicInbox::MID; # mid_clean
 		require PublicInbox::AltId;
 		$self->{-altid} = PublicInbox::AltId->new($ibx, $altid, 1);
 	}
@@ -29,7 +29,7 @@ sub new {
 }
 
 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];
@@ -42,18 +42,25 @@ sub scrub {
 		}
 	});
 	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);
 }