No need to keep the old sub around, anymore. Rename auxiliary
subs to "msg_page_*" instead of the "html" version.
use constant TCHILD => '` ';
sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
use constant TCHILD => '` ';
sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
my ($nr, $ctx) = @_;
my $more = $ctx->{more};
if ($nr == 1) {
my ($nr, $ctx) = @_;
my $more = $ctx->{more};
if ($nr == 1) {
} elsif ($more) {
++$ctx->{end_nr};
# fake an EOF if {more} retrieval fails fails;
} elsif ($more) {
++$ctx->{end_nr};
# fake an EOF if {more} retrieval fails fails;
- eval { msg_html_more($ctx, $nr) };
+ eval { msg_page_more($ctx, $nr) };
} elsif ($nr == $ctx->{end_nr}) {
# fake an EOF if generating the footer fails;
# we want to at least show the message if something
} elsif ($nr == $ctx->{end_nr}) {
# fake an EOF if generating the footer fails;
# we want to at least show the message if something
# public functions: (unstable)
# public functions: (unstable)
-sub msg_html {
- my ($ctx, $mime, $smsg) = @_;
- my $ibx = $ctx->{-inbox};
- $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- my $hdr = $ctx->{hdr} = $mime->header_obj;
- _msg_html_prepare_obuf($hdr, $ctx, 0);
- $ctx->{end_nr} = 2;
- $ctx->{smsg} = $smsg;
- $ctx->{mime} = $mime;
- PublicInbox::WwwStream->response($ctx, 200, \&msg_html_i);
-}
-
sub msg_page {
my ($ctx) = @_;
my $mid = $ctx->{mid};
sub msg_page {
my ($ctx) = @_;
my $mid = $ctx->{mid};
} else {
$first = $ibx->msg_by_mid($mid) or return;
}
} else {
$first = $ibx->msg_by_mid($mid) or return;
}
- msg_html($ctx, PublicInbox::MIME->new($first), $smsg);
+ my $mime = $ctx->{mime} = PublicInbox::MIME->new($first);
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
+ my $hdr = $ctx->{hdr} = $mime->header_obj;
+ _msg_page_prepare_obuf($hdr, $ctx, 0);
+ $ctx->{end_nr} = 2;
+ $ctx->{smsg} = $smsg;
+ PublicInbox::WwwStream->response($ctx, 200, \&msg_page_i);
my ($ctx, $nr) = @_;
my ($id, $prev, $smsg) = @{$ctx->{more}};
my $ibx = $ctx->{-inbox};
my ($ctx, $nr) = @_;
my ($id, $prev, $smsg) = @{$ctx->{more}};
my $ibx = $ctx->{-inbox};
return '' unless $smsg;
my $upfx = '../' . mid_escape($smsg->mid) . '/';
my $mime = delete $smsg->{mime};
return '' unless $smsg;
my $upfx = '../' . mid_escape($smsg->mid) . '/';
my $mime = delete $smsg->{mime};
- _msg_html_prepare_obuf($mime->header_obj, $ctx, $nr);
+ _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
multipart_text_as_html($mime, $upfx, $ctx);
${delete $ctx->{obuf}} .= '</pre><hr>';
}
multipart_text_as_html($mime, $upfx, $ctx);
${delete $ctx->{obuf}} .= '</pre><hr>';
}
obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate};
}
obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate};
}
-sub _msg_html_prepare_obuf {
+sub _msg_page_prepare_obuf {
my ($hdr, $ctx, $nr) = @_;
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my ($hdr, $ctx, $nr) = @_;
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};