remove debbugging effective_type output

[debbugs.git] / Debbugs / Mail.pm

diff --git a/Debbugs/Mail.pm b/Debbugs/Mail.pm
index a00b41c4b72fcf796d6bee1eb5e2ab212fca50ed..68e88a1dccc7258574fb1bb61d74081688a55e6d 100644 (file)
--- a/Debbugs/Mail.pm
+++ b/Debbugs/Mail.pm
@@ -435,8 +435,10 @@ sub reply_headers{
     $r_l{subject} = 'Re: '. $r_l{subject} unless $r_l{subject} =~ /(?:^|\s)Re:\s+/;
     $r_l{subject} =~ s/(?:^\s*|\s*$)//g;
     $r_l{'In-Reply-To'} = $head->get('Message-Id');
+    $r_l{'In-Reply-To'} =~ s/(?:^\s*|\s*$)//g if defined $r_l{'In-Reply-To'};
     delete $r_l{'In-Reply-To'} unless defined $r_l{'In-Reply-To'};
     $r_l{References} = ($head->get('References')//''). ' '.($head->get('Message-Id')//'');
+    $r_l{References} =~ s/(?:^\s*|\s*$)//g;
     my $date = $head->get('Date') // 'some date';
     $date =~ s/(?:^\s*|\s*$)//g;
     my $who = $head->get('From') // $head->get('Reply-To') // 'someone';
@@ -444,14 +446,35 @@ sub reply_headers{
 
     my $body = "On $date $who wrote:\n";
     my $i = 60;
-    my $b_h = $entity->bodyhandle;
-    my $IO = $b_h->open("r");
-    while (defined($_ = $IO->getline)) {
-        $i--;
-        last if $i < 0;
-        $body .= '> '. $_;
+    my $b_h;
+    ## find the first part which has a defined body handle and appears
+    ## to be text
+    if (defined $entity->bodyhandle) {
+        $b_h = $entity->bodyhandle;
+    } elsif ($entity->parts) {
+        my @parts = $entity->parts;
+        while (defined(my $part = shift @parts)) {
+            if ($part->parts) {
+                push @parts,$part->parts;
+            }
+            if (defined $part->bodyhandle and
+                $part->effective_type =~ /text/) {
+                $b_h = $part->bodyhandle;
+                last;
+            }
+        }
+    }
+    if (defined $b_h) {
+        eval {
+            my $IO = $b_h->open("r");
+            while (defined($_ = $IO->getline)) {
+                $i--;
+                last if $i < 0;
+                $body .= '> '. $_;
+            }
+            $IO->close();
+        };
     }
-    $IO->close();
     $r_l{body} = $body;
     return \%r_l;
 }