X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=d8a008c7ffe01bf29862c65a3664e8a04a4b4afc;hp=83b622fbde0cc43dd9f6b83ce26ef7ef5fe090ab;hb=53046dfabf5cea98662dc2e2297947be793262ce;hpb=1f771820fad8b783e6afc81b38e354e6cde0b3f9
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 83b622fb..d8a008c7 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -412,7 +412,7 @@ sub thread_index_entry {
sub stream_thread_i { # PublicInbox::WwwStream::getline callback
my ($nr, $ctx) = @_;
- return unless exists($ctx->{dst});
+ return unless exists($ctx->{skel});
my $q = $ctx->{-queue};
while (@$q) {
my $level = shift @$q;
@@ -425,7 +425,7 @@ sub stream_thread_i { # PublicInbox::WwwStream::getline callback
return ghost_index_entry($ctx, $level, $node);
}
}
- join('', thread_adj_level($ctx, 0)) . ${delete $ctx->{dst}}; # skel
+ join('', thread_adj_level($ctx, 0)) . ${delete $ctx->{skel}};
}
sub stream_thread ($$) {
@@ -449,6 +449,7 @@ sub stream_thread ($$) {
PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i);
}
+# /$INBOX/$MESSAGE_ID/t/
sub thread_html {
my ($ctx) = @_;
my $mid = $ctx->{mid};
@@ -465,7 +466,7 @@ sub thread_html {
$skel .= "-- links below jump to the message on this page --\n";
$ctx->{-upfx} = '../../';
$ctx->{cur_level} = 0;
- $ctx->{dst} = \$skel;
+ $ctx->{skel} = \$skel;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
$ctx->{root_anchor} = anchor_for($mid);
@@ -501,7 +502,7 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback
$ctx->{-inbox}->smsg_mime($smsg) or next;
return index_entry($smsg, $ctx, scalar @$msgs);
}
- my ($skel) = delete @$ctx{qw(dst msgs)};
+ my ($skel) = delete @$ctx{qw(skel msgs)};
$$skel;
}
@@ -722,7 +723,7 @@ sub _msg_html_prepare {
}
sub thread_skel {
- my ($dst, $ctx, $hdr, $tpfx) = @_;
+ my ($skel, $ctx, $hdr, $tpfx) = @_;
my $mid = mids($hdr)->[0];
my $ibx = $ctx->{-inbox};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
@@ -732,21 +733,21 @@ sub thread_skel {
qq(Atom feed);
my $parent = in_reply_to($hdr);
- $$dst .= "\nThread overview: ";
+ $$skel .= "\nThread overview: ";
if ($nr <= 1) {
if (defined $parent) {
- $$dst .= "$expand\n ";
- $$dst .= ghost_parent("$tpfx../", $parent) . "\n";
+ $$skel .= "$expand\n ";
+ $$skel .= ghost_parent("$tpfx../", $parent) . "\n";
} else {
- $$dst .= "[no followups] $expand\n";
+ $$skel .= "[no followups] $expand\n";
}
$ctx->{next_msg} = undef;
$ctx->{parent_msg} = $parent;
return;
}
- $$dst .= "$nr+ messages / $expand";
- $$dst .= qq! top\n!;
+ $$skel .= "$nr+ messages / $expand";
+ $$skel .= qq! top\n!;
# nb: mutt only shows the first Subject in the index pane
# when multiple Subject: headers are present, so we follow suit:
@@ -756,7 +757,7 @@ sub thread_skel {
$ctx->{cur} = $mid;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
- $ctx->{dst} = $dst;
+ $ctx->{skel} = $skel;
# reduce hash lookups in skel_dump
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
@@ -804,11 +805,11 @@ sub html_footer {
my $ibx = $ctx->{-inbox} if $ctx;
my $upfx = '../';
my $tpfx = '';
- my $idx = $standalone ? " index" : '';
+ my $skel = $standalone ? " index" : '';
my $irt = '';
- if ($idx && $ibx->over) {
- $idx .= "\n";
- thread_skel(\$idx, $ctx, $hdr, $tpfx);
+ if ($skel && $ibx->over) {
+ $skel .= "\n";
+ thread_skel(\$skel, $ctx, $hdr, $tpfx);
my ($next, $prev);
my $parent = ' ';
$next = $prev = ' ';
@@ -843,7 +844,7 @@ sub html_footer {
}
$rhref ||= '#R';
$irt .= qq(reply);
- $irt .= $idx;
+ $irt .= $skel;
}
sub linkify_ref_no_over {
@@ -952,12 +953,12 @@ sub skel_dump {
my ($ctx, $level, $node) = @_;
my $smsg = $node->{smsg} or return _skel_ghost($ctx, $level, $node);
- my $dst = $ctx->{dst};
+ my $skel = $ctx->{skel};
my $cur = $ctx->{cur};
my $mid = $smsg->{mid};
if ($level == 0 && $ctx->{skel_dump_roots}++) {
- $$dst .= delete $ctx->{sl_note} || '';
+ $$skel .= delete($ctx->{sl_note}) || '';
}
my $f = ascii_html($smsg->from_name);
@@ -986,7 +987,7 @@ sub skel_dump {
if ($cur) {
if ($cur eq $mid) {
delete $ctx->{cur};
- $$dst .= "$d".
+ $$skel .= "$d".
"$attr [this message]\n";
return 1;
} else {
@@ -1026,7 +1027,7 @@ sub skel_dump {
} else {
$m = $ctx->{-upfx}.mid_escape($mid).'/';
}
- $$dst .= $d . "" . $end;
+ $$skel .= $d . "" . $end;
1;
}
@@ -1051,8 +1052,7 @@ sub _skel_ghost {
} else {
$d .= qq{<$html>\n};
}
- my $dst = $ctx->{dst};
- $$dst .= $d;
+ ${$ctx->{skel}} .= $d;
1;
}