about summary refs log tree commit homepage
path: root/lib/PublicInbox/Filter
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-05-07 21:05:46 +0000
committerEric Wong <e@yhbt.net>2020-05-09 08:59:10 +0000
commita6814118856da197b909d68721d461a3936a085b (patch)
tree878f9c09d4ea95b213db41888c0350b9bf420d52 /lib/PublicInbox/Filter
parent453dee4881a9c764b09d33f3a827879f2cd3669d (diff)
downloadpublic-inbox-a6814118856da197b909d68721d461a3936a085b.tar.gz
Mailman only seems to add trailers (or signatures) as
attachments at the top-level of MIME messages.  So don't bother
recursing with ->walk_parts since ->walk_parts is non-trivial to
recreate in the Email::MIME replacement I'm working on.
Diffstat (limited to 'lib/PublicInbox/Filter')
-rw-r--r--lib/PublicInbox/Filter/RubyLang.pm32
1 files changed, 21 insertions, 11 deletions
diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm
index a65a5971..06e4ea75 100644
--- a/lib/PublicInbox/Filter/RubyLang.pm
+++ b/lib/PublicInbox/Filter/RubyLang.pm
@@ -28,19 +28,29 @@ sub new {
         $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;