treewide: replace {-inbox} with {ibx} for consistency

[public-inbox.git] / lib / PublicInbox / Filter / RubyLang.pm

diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm
index ec4bc320e64192ae4bf195a6241d2473c6dd6763..62cf5d209f1d0e3624f439d44a53bdb6a65cd2eb 100644 (file)
--- 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;
@@ -15,42 +16,61 @@ sub new {
        my ($class, %opts) = @_;
        my $altid = delete $opts{-altid};
        my $self = $class->SUPER::new(%opts);
+       my $ibx = $self->{ibx};
        # 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);
        }
        $self;
 }
 
-sub scrub {
-       my ($self, $mime) = @_;
-       # no msg_iter here, that is only for read-only access
-       $mime->walk_parts(sub {
-               my ($part) = $_[0];
-               my $ct = $part->content_type;
-               if (!$ct || $ct =~ m{\btext/plain\b}i) {
-                       my $s = eval { $part->body_str };
-                       if (defined $s && $s =~ s/\n?$l1\n$l2\n\z//os) {
-                               $part->body_str_set($s);
-                       }
+sub scrub_part ($) {
+       my ($part) = @_;
+       my $ct = $part->content_type;
+       if (!$ct || $ct =~ m{\btext/plain\b}i) {
+               my $s = eval { $part->body_str };
+               if (defined $s && $s =~ s/\n?$l1\n$l2\n\z//os) {
+                       $part->body_str_set($s);
+                       return 1;
                }
-       });
+       }
+       0;
+}
+
+sub scrub {
+       my ($self, $mime, $for_remove) = @_;
+       # no msg_iter here, msg_iter is only for read-only access
+       if (my @sub = $mime->subparts) {
+               my $changed = 0;
+               $changed |= scrub_part($_) for @sub;
+               $mime->parts_set(\@sub) if $changed;
+       } else {
+               scrub_part($mime);
+       }
        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);
 }