filter/rubylang: adjust filter for new list software

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

diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm
index a43d67a9352e4ea6ab71aad954b3fe44933d55e3..57ebbe78f5e173e3a723bb2968da0dac816d7424 100644 (file)
--- a/lib/PublicInbox/Filter/RubyLang.pm
+++ b/lib/PublicInbox/Filter/RubyLang.pm
@@ -1,11 +1,10 @@
-# Copyright (C) 2017-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 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
 package PublicInbox::Filter::RubyLang;
-use base qw(PublicInbox::Filter::Base);
-use strict;
-use warnings;
+use v5.10.1;
+use parent qw(PublicInbox::Filter::Base);
 use PublicInbox::MID qw(mids);
 
 my $l1 = qr/Unsubscribe:\s
@@ -16,47 +15,62 @@ sub new {
        my ($class, %opts) = @_;
        my $altid = delete $opts{-altid};
        my $self = $class->SUPER::new(%opts);
-       my $ibx = $self->{-inbox};
+       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
                require PublicInbox::AltId;
                $self->{-altid} = PublicInbox::AltId->new($ibx, $altid, 1);
        }
        $self;
 }
 
+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, 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);
-                       }
-               }
-       });
+       # 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 && !$for_remove) {
                my $hdr = $mime->header_obj;
                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;
-               }
-               unless (defined $n) {
-                       return $self->REJECT('X-Mail-Count not numeric');
+               my @v = $hdr->header_raw('X-Mail-Count'); # old host only
+               if (@v) {
+                       for (@v) {
+                               /\A\s*([0-9]+)\s*\z/ or next;
+                               $n = $1;
+                               last;
+                       }
+               } else { # new host: nue.mailmanlists.eu
+                       for ($hdr->header_str('Subject')) {
+                               /\A\[ruby-[^:]+:([0-9]+)\]/ or next;
+                               $n = $1;
+                               last;
+                       }
                }
+               $n // return $self->REJECT('could not get count not numeric');
                foreach my $mid (@$mids) {
                        my $r = $altid->mm_alt->mid_set($n, $mid);
                        next if $r == 0;