X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFilter%2FRubyLang.pm;h=cb69e38a68aa01891287edd8b53448e53cd36259;hb=56489ee40e44255f2f9a00cd608bc366d2586306;hp=ec4bc320e64192ae4bf195a6241d2473c6dd6763;hpb=9b80f2bedbe5a8a9154dfa0ba3c7e63012287bea;p=public-inbox.git
diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm
index ec4bc320..cb69e38a 100644
--- a/lib/PublicInbox/Filter/RubyLang.pm
+++ b/lib/PublicInbox/Filter/RubyLang.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 all contributors
+# Copyright (C) 2017-2018 all contributors
# License: AGPL-3.0+
# 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
/x;
@@ -15,10 +16,13 @@ sub new {
my ($class, %opts) = @_;
my $altid = delete $opts{-altid};
my $self = $class->SUPER::new(%opts);
+ my $ibx = $self->{-inbox};
# altid = serial:ruby-core:file=msgmap.sqlite3
+ if (!$altid && $ibx && $ibx->{altid}) {
+ $altid ||= $ibx->{altid}->[0];
+ }
if ($altid) {
require PublicInbox::MID; # mid_clean
- my $ibx = $self->{-inbox};
require PublicInbox::AltId;
$self->{-altid} = PublicInbox::AltId->new($ibx, $altid, 1);
}
@@ -41,16 +45,23 @@ sub scrub {
my $altid = $self->{-altid};
if ($altid) {
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*(\d+)\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);
}