$html>\n)
}
$rv .= "\n";
@@ -311,7 +300,7 @@ sub _th_index_lite {
if (my $smsg = $node->{smsg}) {
# delete saves about 200KB on a 1K message thread
if (my $refs = delete $smsg->{references}) {
- ($$irt) = ($refs =~ m/<([^>]+)>\z/);
+ ($$irt) = ($refs =~ m/$MID_EXTRACT\z/o);
}
}
my $irt_map = $mapping->{$$irt} if defined $$irt;
@@ -423,7 +412,7 @@ sub stream_thread ($$) {
return missing_thread($ctx) unless $smsg;
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- $ctx->{-title_html} = ascii_html($smsg->subject);
+ $ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg);
$ctx->{-queue} = \@q;
PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i);
@@ -469,7 +458,7 @@ sub thread_html {
$smsg = $ibx->smsg_mime($m) and last;
}
return missing_thread($ctx) unless $smsg;
- $ctx->{-title_html} = ascii_html($smsg->subject);
+ $ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-html_tip} = ''.index_entry($smsg, $ctx, scalar @$msgs);
$ctx->{msgs} = $msgs;
PublicInbox::WwwStream->response($ctx, 200, \&thread_html_i);
@@ -529,7 +518,9 @@ sub attach_link ($$$$;$) {
my $rv = $ctx->{obuf};
$$rv .= qq($nl{mhref}$idx-$sfn">);
if ($err) {
- $$rv .= "[-- Warning: decoded text below may be mangled --]\n";
+ $$rv .= <[^\n]*\n)+)/sm, $s);
+ my @sections = PublicInbox::MsgIter::split_quotes($s);
$s = '';
my $rv = $ctx->{obuf};
if (defined($fn) || $depth > 0 || $err) {
@@ -631,10 +622,9 @@ sub _msg_page_prepare_obuf {
}
my @title; # (Subject[0], From[0])
for my $v ($hdr->header('From')) {
- $v = PublicInbox::Hval->new($v);
- my @n = PublicInbox::Address::names($v->raw);
+ my @n = PublicInbox::Address::names($v);
+ $v = ascii_html($v);
$title[1] //= ascii_html(join(', ', @n));
- $v = $v->as_html;
if ($obfs_ibx) {
obfuscate_addrs($obfs_ibx, $v);
obfuscate_addrs($obfs_ibx, $title[1]);
@@ -672,8 +662,7 @@ sub _msg_page_prepare_obuf {
}
$ctx->{-title_html} = join(' - ', @title);
if (scalar(@$mids) == 1) { # common case
- my $mid = PublicInbox::Hval->new_msgid($mids->[0]);
- my $mhtml = $mid->as_html;
+ my $mhtml = ascii_html($mids->[0]);
$rv .= "Message-ID: <$mhtml> ";
$rv .= "(raw)\n";
} else {
@@ -689,7 +678,7 @@ sub _msg_page_prepare_obuf {
}
$rv .= _parent_headers($hdr, $over);
$rv .= "\n";
- $ctx->{obuf} = \$rv;
+ \$rv;
}
sub SKEL_EXPAND () {
@@ -751,9 +740,8 @@ sub _parent_headers {
$refs = references($hdr);
my $irt = pop @$refs;
if (defined $irt) {
- my $v = PublicInbox::Hval->new_msgid($irt);
- my $html = $v->as_html;
- my $href = $v->{href};
+ my $html = ascii_html($irt);
+ my $href = mid_href($irt);
$rv .= "In-Reply-To: <";
$rv .= "$html>\n";
}
@@ -773,9 +761,8 @@ sub _parent_headers {
# returns a string buffer via ->getline
sub html_footer {
- my ($ctx) = @_;
+ my ($ctx, $hdr) = @_;
my $ibx = $ctx->{-inbox};
- my $hdr = delete $ctx->{hdr};
my $upfx = '../';
my $skel = " index";
my $rv = '';
@@ -787,17 +774,17 @@ sub html_footer {
$next = $prev = ' ';
if (my $n = $ctx->{next_msg}) {
- $n = PublicInbox::Hval->new_msgid($n)->{href};
+ $n = mid_href($n);
$next = "next";
}
my $u;
my $par = $ctx->{parent_msg};
if ($par) {
- $u = PublicInbox::Hval->new_msgid($par)->{href};
+ $u = mid_href($par);
$u = "$upfx$u/";
}
if (my $p = $ctx->{prev_msg}) {
- $prev = PublicInbox::Hval->new_msgid($p)->{href};
+ $prev = mid_href($p);
if ($p && $par && $p eq $par) {
$prev = "prev parent';
@@ -819,9 +806,9 @@ sub html_footer {
}
sub linkify_ref_no_over {
- my $v = PublicInbox::Hval->new_msgid($_[0]);
- my $html = $v->as_html;
- my $href = $v->{href};
+ my ($mid) = @_;
+ my $href = mid_href($mid);
+ my $html = ascii_html($mid);
"<$html>";
}
@@ -833,9 +820,8 @@ sub anchor_for {
sub ghost_parent {
my ($upfx, $mid) = @_;
- $mid = PublicInbox::Hval->new_msgid($mid);
- my $href = $mid->{href};
- my $html = $mid->as_html;
+ my $href = mid_href($mid);
+ my $html = ascii_html($mid);
qq{[parent not found: <$html>]};
}
@@ -932,7 +918,7 @@ sub skel_dump { # walk_thread callback
$$skel .= delete($ctx->{sl_note}) || '';
}
- my $f = ascii_html($smsg->from_name);
+ my $f = ascii_html($smsg->{from_name});
my $obfs_ibx = $ctx->{-obfs_ibx};
obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
@@ -971,7 +957,7 @@ sub skel_dump { # walk_thread callback
# Subject is never undef, this mail was loaded from
# our Xapian which would've resulted in '' if it were
# really missing (and Filter rejects empty subjects)
- my @subj = split(/ /, subject_normalized($smsg->subject));
+ my @subj = split(/ /, subject_normalized($smsg->{subject}));
# remove common suffixes from the subject if it matches the previous,
# so we do not show redundant text at the end.
my $prev_subj = $ctx->{prev_subj} || [];
@@ -996,7 +982,7 @@ sub skel_dump { # walk_thread callback
$map->[0] = "$d$end";
$id = "\nid=r".$id;
} else {
- $m = $ctx->{-upfx}.mid_escape($mid).'/';
+ $m = $ctx->{-upfx}.mid_href($mid).'/';
}
$$skel .= $d . "" . $end;
1;
@@ -1010,9 +996,8 @@ sub _skel_ghost {
$d .= ' ' if exists $ctx->{searchview};
$d .= indent_for($level) . th_pfx($level);
my $upfx = $ctx->{-upfx};
- my $m = PublicInbox::Hval->new_msgid($mid);
- my $href = $upfx . $m->{href} . '/';
- my $html = $m->as_html;
+ my $href = $upfx . mid_href($mid) . '/';
+ my $html = ascii_html($mid);
my $mapping = $ctx->{mapping};
my $map = $mapping->{$mid} if $mapping;
@@ -1029,8 +1014,8 @@ sub _skel_ghost {
sub sort_ds {
[ sort {
- (eval { $a->topmost->{smsg}->ds } || 0) <=>
- (eval { $b->topmost->{smsg}->ds } || 0)
+ (eval { $a->topmost->{smsg}->{ds} } || 0) <=>
+ (eval { $b->topmost->{smsg}->{ds} } || 0)
} @{$_[0]} ];
}
@@ -1039,35 +1024,32 @@ sub sort_ds {
sub acc_topic { # walk_thread callback
my ($ctx, $level, $node) = @_;
my $mid = $node->{id};
- my $x = $node->{smsg} || $ctx->{-inbox}->smsg_by_mid($mid);
- my ($subj, $ds);
- my $topic;
- if ($x) {
- $subj = $x->subject;
- $subj = subject_normalized($subj);
+ my $smsg = $node->{smsg} // $ctx->{-inbox}->smsg_by_mid($mid);
+ if ($smsg) {
+ my $subj = subject_normalized($smsg->{subject});
$subj = '(no subject)' if $subj eq '';
- $ds = $x->ds;
- if ($level == 0) {
- $topic = [ $ds, 1, { $subj => $mid }, $subj ];
+ my $ds = $smsg->{ds};
+ if ($level == 0) { # new, top-level topic
+ my $topic = [ $ds, 1, { $subj => $mid }, $subj ];
$ctx->{-cur_topic} = $topic;
push @{$ctx->{order}}, $topic;
return 1;
}
- $topic = $ctx->{-cur_topic}; # should never be undef
+ # continue existing topic
+ my $topic = $ctx->{-cur_topic}; # should never be undef
$topic->[0] = $ds if $ds > $topic->[0];
- $topic->[1]++;
+ $topic->[1]++; # bump N+ message counter
my $seen = $topic->[2];
if (scalar(@$topic) == 3) { # parent was a ghost
push @$topic, $subj;
- } elsif (!$seen->{$subj}) {
- push @$topic, $level, $subj;
+ } elsif (!defined($seen->{$subj})) {
+ push @$topic, $level, $subj; # @extra messages
}
$seen->{$subj} = $mid; # latest for subject
} else { # ghost message
return 1 if $level != 0; # ignore child ghosts
- $topic = [ -666, 0, {} ];
- $ctx->{-cur_topic} = $topic;
+ my $topic = $ctx->{-cur_topic} = [ -666, 0, {} ];
push @{$ctx->{order}}, $topic;
}
1;
@@ -1076,7 +1058,7 @@ sub acc_topic { # walk_thread callback
sub dump_topics {
my ($ctx) = @_;
my $order = delete $ctx->{order}; # [ ds, subj1, subj2, subj3, ... ]
- if (!@$order) {
+ unless ($order) {
$ctx->{-html_tip} = '[No topics in range]
';
return 404;
}
@@ -1087,13 +1069,13 @@ sub dump_topics {
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
- my ($ds, $n, $seen, $top, @ex) = @$topic;
+ my ($ds, $n, $seen, $top_subj, @extra) = @$topic;
@$topic = ();
- next unless defined $top; # ghost topic
- my $mid = delete $seen->{$top};
- my $href = mid_escape($mid);
- my $prev_subj = [ split(/ /, $top) ];
- $top = PublicInbox::Hval->new($top)->as_html;
+ next unless defined $top_subj; # ghost topic
+ my $mid = delete $seen->{$top_subj};
+ my $href = mid_href($mid);
+ my $prev_subj = [ split(/ /, $top_subj) ];
+ $top_subj = ascii_html($top_subj);
$ds = fmt_ts($ds);
# $n isn't the total number of posts on the topic,
@@ -1109,21 +1091,21 @@ sub dump_topics {
my $mbox = qq(mbox.gz);
my $atom = qq(Atom);
- my $s = "$top\n" .
+ my $s = "$top_subj\n" .
" $ds UTC $n - $mbox / $atom\n";
- for (my $i = 0; $i < scalar(@ex); $i += 2) {
- my $level = $ex[$i];
- my $subj = $ex[$i + 1];
+ for (my $i = 0; $i < scalar(@extra); $i += 2) {
+ my $level = $extra[$i];
+ my $subj = $extra[$i + 1]; # already normalized
$mid = delete $seen->{$subj};
- my @subj = split(/ /, subject_normalized($subj));
+ my @subj = split(/ /, $subj);
my @next_prev = @subj; # full copy
my $omit = dedupe_subject($prev_subj, \@subj, ' "');
$prev_subj = \@next_prev;
- $subj = ascii_html(join(' ', @subj));
+ $subj = ascii_html($subj);
obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
- $href = mid_escape($mid);
+ $href = mid_href($mid);
$s .= indent_for($level) . TCHILD;
- $s .= "$subj$omit\n";
+ $s .= qq($subj$omit\n);
}
push @out, $s;
}