thread: pass array refs instead of entire arrays

[public-inbox.git] / lib / PublicInbox / View.pm

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 6997c1c595c270e0e14c21ccfb29cfdd969c18f2..e90efda16783ec2241050eededef689ae55af2a5 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -413,7 +413,6 @@ sub attach_link ($$$$;$) {
        my $nl = $idx[-1] > 1 ? "\n" : '';
        my $idx = join('.', @idx);
        my $size = bytes::length($part->body);
-       $ct ||= 'text/plain';
 
        # hide attributes normally, unless we want to aid users in
        # spotting MUA problems:
@@ -444,10 +443,10 @@ sub attach_link ($$$$;$) {
 sub add_text_body {
        my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
        my ($part, $depth, @idx) = @$p;
-       my $ct = $part->content_type;
+       my $ct = $part->content_type || 'text/plain';
        my $fn = $part->filename;
 
-       if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
+       if ($ct =~ m!\btext/x?html\b!i) {
                return attach_link($upfx, $ct, $p, $fn);
        }
 
@@ -724,8 +723,6 @@ sub anchor_for {
 
 sub ghost_parent {
        my ($upfx, $mid) = @_;
-       # 'subject dummy' is used internally by Mail::Thread
-       return '[no common parent]' if ($mid eq 'subject dummy');
 
        $mid = PublicInbox::Hval->new_msgid($mid);
        my $href = $mid->{href};
@@ -752,8 +749,8 @@ sub msg_timestamp {
 
 sub thread_results {
        my ($msgs) = @_;
-       require PublicInbox::Thread;
-       my $th = PublicInbox::Thread->new(@$msgs);
+       require PublicInbox::SearchThread;
+       my $th = PublicInbox::SearchThread->new($msgs);
        $th->thread;
        $th->order(*sort_ts);
        $th
@@ -839,12 +836,6 @@ sub skel_dump {
                my $dst = $ctx->{dst};
                my $mapping = $ctx->{mapping};
                my $map = $mapping->{$mid} if $mapping;
-               if ($mid eq 'subject dummy') {
-                       my $ncp = "\t[no common parent]\n";
-                       $map->[1] = $ncp if $map;
-                       $$dst .= $ncp;
-                       return;
-               }
                my $d = $ctx->{pct} ? '    [irrelevant] ' # search result
                                    : '     [not found] ';
                $d .= indent_for($level) . th_pfx($level);
@@ -865,10 +856,10 @@ sub skel_dump {
 }
 
 sub sort_ts {
-       sort {
+       [ sort {
                (eval { $a->topmost->message->header('X-PI-TS') } || 0) <=>
                (eval { $b->topmost->message->header('X-PI-TS') } || 0)
-       } @_;
+       } @{$_[0]} ];
 }
 
 sub _tryload_ghost ($$) {