this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
- and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
$p_url
$info
-* Reply to all the recipients using the --to, --cc,
- and --in-reply-to switches of git-send-email(1):
+* Reply using the --to, --cc, and --in-reply-to
+ switches of git-send-email(1):
git send-email$arg
$se_url
-
-* If your mail client supports setting the In-Reply-To header
- via mailto: links, try the mailto: link
+$link
EOF
}
sub in_reply_to {
my ($hdr) = @_;
- my $irt = $hdr->header_raw('In-Reply-To');
-
- return mid_clean($irt) if defined $irt && $irt ne '';
-
- my $refs = $hdr->header_raw('References');
- if ($refs && $refs =~ /<([^>]+)>\s*\z/s) {
- return $1;
- }
- undef;
+ my $refs = references($hdr);
+ $refs->[-1];
}
-sub _hdr_names ($$) {
+sub _hdr_names_html ($$) {
my ($hdr, $field) = @_;
my $val = $hdr->header($field) or return '';
ascii_html(join(', ', PublicInbox::Address::names($val)));
@@ -117,29 +188,36 @@ sub nr_to_s ($$$) {
# this is already inside a
sub index_entry {
- my ($mime, $ctx, $more) = @_;
+ my ($smsg, $ctx, $more) = @_;
my $srch = $ctx->{srch};
- my $hdr = $mime->header_obj;
- my $subj = $hdr->header('Subject');
-
- my $mid_raw = mid_clean(mid_mime($mime));
+ my $subj = $smsg->subject;
+ my $mid_raw = $smsg->mid;
my $id = id_compress($mid_raw, 1);
my $id_m = 'm'.$id;
my $root_anchor = $ctx->{root_anchor} || '';
my $irt;
+ my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = "* ";
$subj = ''.ascii_html($subj).'';
+ obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
$subj = "$subj" if $root_anchor eq $id_m;
$rv .= $subj . "\n";
$rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
my @tocc;
+ my $mime = $smsg->{mime};
+ my $hdr = $mime->header_obj;
foreach my $f (qw(To Cc)) {
- my $dst = _hdr_names($hdr, $f);
- push @tocc, "$f: $dst" if $dst ne '';
+ my $dst = _hdr_names_html($hdr, $f);
+ if ($dst ne '') {
+ obfuscate_addrs($obfs_ibx, $dst) if $obfs_ibx;
+ push @tocc, "$f: $dst";
+ }
}
- $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC";
+ my $from = _hdr_names_html($hdr, 'From');
+ obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
+ $rv .= "From: $from @ ".fmt_ts($smsg->ds)." UTC";
my $upfx = $ctx->{-upfx};
my $mhref = $upfx . mid_escape($mid_raw) . '/';
$rv .= qq{ (permalink / };
@@ -156,7 +234,7 @@ sub index_entry {
$rv .= "\n";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub { $rv .= add_text_body($mhref, $_[0]) });
+ msg_iter($mime, sub { $rv .= add_text_body($mhref, $obfs_ibx, $_[0]) });
# add the footer
$rv .= "\n^ ".
@@ -169,17 +247,17 @@ sub index_entry {
$rv .= "\t[relevance $pct->{$mid_raw}%]";
$hr = 1;
} elsif ($mapping) {
- my $threaded = 'threaded';
+ my $nested = 'nested';
my $flat = 'flat';
my $end = '';
if ($ctx->{flat}) {
$hr = 1;
$flat = "$flat";
} else {
- $threaded = "$threaded";
+ $nested = "$nested";
}
$rv .= "\t[$flat";
- $rv .= "|$threaded]";
+ $rv .= "|$nested]";
$rv .= " $ctx->{s_nr}";
} else {
$hr = $ctx->{-hr};
@@ -201,7 +279,10 @@ sub _th_index_lite {
my $rv = '';
my $mapping = $ctx->{mapping} or return $rv;
my $pad = ' ';
- my ($attr, $node, $idx, $level) = @{$mapping->{$mid_raw}};
+ my $mid_map = $mapping->{$mid_raw};
+ defined $mid_map or
+ return 'public-inbox BUG: '.ascii_html($mid_raw).' not mapped';
+ my ($attr, $node, $idx, $level) = @$mid_map;
my $children = $node->{children};
my $nr_c = scalar @$children;
my $nr_s = 0;
@@ -279,29 +360,30 @@ sub pre_thread {
}
sub thread_index_entry {
- my ($ctx, $level, $mime) = @_;
+ my ($ctx, $level, $smsg) = @_;
my ($beg, $end) = thread_adj_level($ctx, $level);
- $beg . '' . index_entry($mime, $ctx, 0) . '
' . $end;
+ $beg . '' . index_entry($smsg, $ctx, 0) . '
' . $end;
}
sub stream_thread ($$) {
my ($rootset, $ctx) = @_;
my $inbox = $ctx->{-inbox};
- my $mime;
my @q = map { (0, $_) } @$rootset;
my $level;
+ my $smsg;
while (@q) {
$level = shift @q;
my $node = shift @q or next;
my $cl = $level + 1;
unshift @q, map { ($cl, $_) } @{$node->{children}};
- $mime = $inbox->msg_by_smsg($node->{smsg}) and last;
+ $smsg = $inbox->smsg_mime($node->{smsg}) and last;
}
- return missing_thread($ctx) unless $mime;
+ return missing_thread($ctx) unless $smsg;
- $mime = Email::MIME->new($mime);
- $ctx->{-title_html} = ascii_html($mime->header('Subject'));
- $ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime);
+ $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
+ $ctx->{-title_html} = ascii_html($smsg->subject);
+ $ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg);
+ $smsg = undef;
PublicInbox::WwwStream->response($ctx, 200, sub {
return unless $ctx;
while (@q) {
@@ -309,10 +391,8 @@ sub stream_thread ($$) {
my $node = shift @q or next;
my $cl = $level + 1;
unshift @q, map { ($cl, $_) } @{$node->{children}};
- my $mid = $node->{id};
- if ($mime = $inbox->msg_by_smsg($node->{smsg})) {
- $mime = Email::MIME->new($mime);
- return thread_index_entry($ctx, $level, $mime);
+ if ($smsg = $inbox->smsg_mime($node->{smsg})) {
+ return thread_index_entry($ctx, $level, $smsg);
} else {
return ghost_index_entry($ctx, $level, $node);
}
@@ -346,49 +426,46 @@ sub thread_html {
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
$ctx->{root_anchor} = anchor_for($mid);
- $ctx->{seen} = {};
$ctx->{mapping} = {};
$ctx->{s_nr} = "$nr+ messages in thread";
- my $rootset = thread_results($msgs);
+ my $rootset = thread_results($ctx, $msgs);
+
+ # reduce hash lookups in pre_thread->skel_dump
+ my $inbox = $ctx->{-inbox};
+ $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
walk_thread($rootset, $ctx, *pre_thread);
+
$skel .= '
';
return stream_thread($rootset, $ctx) unless $ctx->{flat};
# flat display: lazy load the full message from smsg
- my $inbox = $ctx->{-inbox};
- my $mime;
- while ($mime = shift @$msgs) {
- $mime = $inbox->msg_by_smsg($mime) and last;
- }
- return missing_thread($ctx) unless $mime;
- $mime = Email::MIME->new($mime);
- $ctx->{-title_html} = ascii_html($mime->header('Subject'));
- $ctx->{-html_tip} = ''.index_entry($mime, $ctx, scalar @$msgs);
- $mime = undef;
+ my $smsg;
+ while (my $m = shift @$msgs) {
+ $smsg = $inbox->smsg_mime($m) and last;
+ }
+ return missing_thread($ctx) unless $smsg;
+ $ctx->{-title_html} = ascii_html($smsg->subject);
+ $ctx->{-html_tip} = ''.index_entry($smsg, $ctx, scalar @$msgs);
+ $smsg = undef;
PublicInbox::WwwStream->response($ctx, 200, sub {
return unless $msgs;
- while ($mime = shift @$msgs) {
- $mime = $inbox->msg_by_smsg($mime) and last;
- }
- if ($mime) {
- $mime = Email::MIME->new($mime);
- return index_entry($mime, $ctx, scalar @$msgs);
+ $smsg = undef;
+ while (my $m = shift @$msgs) {
+ $smsg = $inbox->smsg_mime($m) and last;
}
+ return index_entry($smsg, $ctx, scalar @$msgs) if $smsg;
$msgs = undef;
$skel;
});
}
sub multipart_text_as_html {
- my ($mime, $upfx) = @_;
+ my ($mime, $upfx, $obfs_ibx) = @_;
my $rv = "";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub {
- my ($p) = @_;
- $rv .= add_text_body($upfx, $p);
- });
+ msg_iter($mime, sub { $rv .= add_text_body($upfx, $obfs_ibx, $_[0]) });
$rv;
}
@@ -435,12 +512,14 @@ sub attach_link ($$$$;$) {
}
$ret .= "[-- Attachment #$idx: ";
my $ts = "Type: $ct, Size: $size bytes";
+ $desc = ascii_html($desc);
$ret .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]";
$ret .= "\n";
}
sub add_text_body {
- my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
+ my ($upfx, $obfs_ibx, $p) = @_;
+ # $p - from msg_iter: [ Email::MIME, depth, @idx ]
my ($part, $depth) = @$p; # attachment @idx is unused
my $ct = $part->content_type || 'text/plain';
my $fn = $part->filename;
@@ -476,15 +555,14 @@ sub add_text_body {
}
my @quot;
my $l = PublicInbox::Linkify->new;
- while (defined(my $cur = shift @lines)) {
+ foreach my $cur (@lines) {
if ($cur !~ /^>/) {
# show the previously buffered quote inline
flush_quote(\$s, $l, \@quot) if @quot;
# regular line, OK
- $cur = $l->linkify_1($cur);
- $cur = ascii_html($cur);
- $s .= $l->linkify_2($cur);
+ $l->linkify_1($cur);
+ $s .= $l->linkify_2(ascii_html($cur));
} else {
push @quot, $cur;
}
@@ -492,25 +570,39 @@ sub add_text_body {
if (@quot) { # ugh, top posted
flush_quote(\$s, $l, \@quot);
- } elsif ($s =~ /\n\z/s) { # common, last line ends with a newline
+ obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
$s;
- } else { # some editors don't do newlines...
- $s .= "\n";
+ } else {
+ obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
+ if ($s =~ /\n\z/s) { # common, last line ends with a newline
+ $s;
+ } else { # some editors don't do newlines...
+ $s .= "\n";
+ }
}
}
sub _msg_html_prepare {
- my ($hdr, $ctx) = @_;
+ my ($hdr, $ctx, $more, $nr) = @_;
my $srch = $ctx->{srch} if $ctx;
my $atom = '';
- my $rv = ""; # anchor for body start
-
+ my $obfs_ibx = $ctx->{-obfs_ibx};
+ my $rv = '';
+ my $mids = mids($hdr);
+ my $multiple = scalar(@$mids) > 1; # zero, one, infinity
+ if ($nr == 0) {
+ if ($more) {
+ $rv .=
+"WARNING: multiple messages refer to this Message-ID\n
";
+ }
+ $rv .= ""; # anchor for body start
+ } else {
+ $rv .= '';
+ }
if ($srch) {
$ctx->{-upfx} = '../';
}
my @title;
- my $mid = mid_clean($hdr->header_raw('Message-ID'));
- $mid = PublicInbox::Hval->new_msgid($mid);
foreach my $h (qw(From To Cc Subject Date)) {
my $v = $hdr->header($h);
defined($v) && ($v ne '') or next;
@@ -519,6 +611,7 @@ sub _msg_html_prepare {
if ($h eq 'From') {
my @n = PublicInbox::Address::names($v->raw);
$title[1] = ascii_html(join(', ', @n));
+ obfuscate_addrs($obfs_ibx, $title[1]) if $obfs_ibx;
} elsif ($h eq 'Subject') {
$title[0] = $v->as_html;
if ($srch) {
@@ -528,14 +621,26 @@ sub _msg_html_prepare {
}
}
$v = $v->as_html;
- $v =~ s/(\@[^,]+,) /$1\n\t/g if ($h eq 'Cc' || $h eq 'To');
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
$rv .= "$h: $v\n";
}
$title[0] ||= '(no subject)';
$ctx->{-title_html} = join(' - ', @title);
- $rv .= 'Message-ID: <' . $mid->as_html . '> ';
- $rv .= "(raw)\n";
+ foreach (@$mids) {
+ my $mid = PublicInbox::Hval->new_msgid($_) ;
+ my $mhtml = $mid->as_html;
+ if ($multiple) {
+ my $href = $mid->{href};
+ $rv .= "Message-ID: ";
+ $rv .= "";
+ $rv .= "<$mhtml> ";
+ $rv .= "(raw)\n";
+ } else {
+ $rv .= "Message-ID: <$mhtml> ";
+ $rv .= "(raw)\n";
+ }
+ }
$rv .= _parent_headers($hdr, $srch);
$rv .= "\n";
}
@@ -543,38 +648,45 @@ sub _msg_html_prepare {
sub thread_skel {
my ($dst, $ctx, $hdr, $tpfx) = @_;
my $srch = $ctx->{srch};
- my $mid = mid_clean($hdr->header_raw('Message-ID'));
+ my $mid = mids($hdr)->[0];
my $sres = $srch->get_thread($mid);
my $nr = $sres->{total};
- my $expand = qq(expand ) .
- qq(/ mbox.gz ) .
- qq(/ Atom feed);
+ my $expand = qq(expand[flat) .
+ qq(|nested] ) .
+ qq(mbox.gz ) .
+ qq(Atom feed);
my $parent = in_reply_to($hdr);
$$dst .= "\nThread overview: ";
if ($nr <= 1) {
if (defined $parent) {
- $$dst .= "($expand)\n ";
+ $$dst .= "$expand\n ";
$$dst .= ghost_parent("$tpfx../", $parent) . "\n";
} else {
- $$dst .= "[no followups, yet] ($expand)\n";
+ $$dst .= "[no followups] $expand\n";
}
$ctx->{next_msg} = undef;
$ctx->{parent_msg} = $parent;
return;
}
- $$dst .= "$nr+ messages in thread ($expand";
- $$dst .= qq! / [top])\n!;
+ $$dst .= "$nr+ messages / $expand";
+ $$dst .= qq! top\n!;
- my $subj = $srch->subject_path($hdr->header('Subject'));
- $ctx->{seen} = { $subj => 1 };
+ my $subj = $hdr->header('Subject');
+ defined $subj or $subj = '';
+ $ctx->{prev_subj} = [ split(/ /, $srch->subject_normalized($subj)) ];
$ctx->{cur} = $mid;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
$ctx->{dst} = $dst;
$sres = load_results($srch, $sres);
- walk_thread(thread_results($sres), $ctx, *skel_dump);
+
+ # reduce hash lookups in skel_dump
+ my $ibx = $ctx->{-inbox};
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
+ walk_thread(thread_results($ctx, $sres), $ctx, *skel_dump);
+
$ctx->{parent_msg} = $parent;
}
@@ -615,49 +727,6 @@ sub _parent_headers {
$rv;
}
-sub squote_maybe ($) {
- my ($val) = @_;
- if ($val =~ m{([^\w@\./,\%\+\-])}) {
- $val =~ s/(['!])/'\\$1'/g; # '!' for csh
- return "'$val'";
- }
- $val;
-}
-
-sub mailto_arg_link {
- my ($hdr) = @_;
- my %cc; # everyone else
- my $to; # this is the From address
-
- foreach my $h (qw(From To Cc)) {
- my $v = $hdr->header($h);
- defined($v) && ($v ne '') or next;
- my @addrs = PublicInbox::Address::emails($v);
- foreach my $address (@addrs) {
- my $dst = lc($address);
- $cc{$dst} ||= $address;
- $to ||= $dst;
- }
- }
- my @arg;
-
- my $subj = $hdr->header('Subject') || '';
- $subj = "Re: $subj" unless $subj =~ /\bRe:/i;
- my $mid = $hdr->header_raw('Message-ID');
- push @arg, '--in-reply-to='.squote_maybe(mid_clean($mid));
- my $irt = mid_escape($mid);
- delete $cc{$to};
- push @arg, "--to=$to";
- $to = uri_escape_utf8($to);
- $subj = uri_escape_utf8($subj);
- my @cc = sort values %cc;
- push(@arg, map { "--cc=$_" } @cc);
- my $cc = uri_escape_utf8(join(',', @cc));
- my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj";
-
- (\@arg, ascii_html($href));
-}
-
sub html_footer {
my ($hdr, $standalone, $ctx, $rhref) = @_;
@@ -729,7 +798,7 @@ sub ghost_parent {
sub indent_for {
my ($level) = @_;
- INDENT x ($level - 1);
+ $level ? INDENT x ($level - 1) : '';
}
sub load_results {
@@ -738,16 +807,10 @@ sub load_results {
$srch->retry_reopen(sub { [ map { $_->mid; $_ } @$msgs ] });
}
-sub msg_timestamp {
- my ($hdr) = @_;
- my $ts = eval { str2time($hdr->header('Date')) };
- defined($ts) ? $ts : 0;
-}
-
sub thread_results {
- my ($msgs) = @_;
+ my ($ctx, $msgs) = @_;
require PublicInbox::SearchThread;
- PublicInbox::SearchThread::thread($msgs, *sort_ts);
+ PublicInbox::SearchThread::thread($msgs, *sort_ds, $ctx->{-inbox});
}
sub missing_thread {
@@ -758,12 +821,30 @@ sub missing_thread {
sub _msg_date {
my ($hdr) = @_;
- my $ts = $hdr->header('X-PI-TS') || msg_timestamp($hdr);
- fmt_ts($ts);
+ fmt_ts(msg_datestamp($hdr));
}
sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
+sub dedupe_subject {
+ my ($prev_subj, $subj, $val) = @_;
+
+ my $omit = ''; # '"' denotes identical text omitted
+ my (@prev_pop, @curr_pop);
+ while (@$prev_subj && @$subj && $subj->[-1] eq $prev_subj->[-1]) {
+ push(@prev_pop, pop(@$prev_subj));
+ push(@curr_pop, pop(@$subj));
+ $omit ||= $val;
+ }
+ pop @$subj if @$subj && $subj->[-1] =~ /^re:\s*/i;
+ if (scalar(@curr_pop) == 1) {
+ $omit = '';
+ push @$prev_subj, @prev_pop;
+ push @$subj, @curr_pop;
+ }
+ $omit;
+}
+
sub skel_dump {
my ($ctx, $level, $node) = @_;
my $smsg = $node->{smsg} or return _skel_ghost($ctx, $level, $node);
@@ -771,8 +852,12 @@ sub skel_dump {
my $dst = $ctx->{dst};
my $cur = $ctx->{cur};
my $mid = $smsg->{mid};
+
my $f = ascii_html($smsg->from_name);
- my $d = fmt_ts($smsg->{ts}) . ' ' . indent_for($level) . th_pfx($level);
+ my $obfs_ibx = $ctx->{-obfs_ibx};
+ obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
+
+ my $d = fmt_ts($smsg->{ds}) . ' ' . indent_for($level) . th_pfx($level);
my $attr = $f;
$ctx->{first_level} ||= $level;
@@ -797,19 +882,25 @@ sub skel_dump {
# 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 $s = $smsg->subject;
- my $h = $ctx->{srch}->subject_path($s);
- if ($ctx->{seen}->{$h}) {
- $s = undef;
+ my @subj = split(/ /, $ctx->{srch}->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} || [];
+ $ctx->{prev_subj} = [ @subj ];
+ my $omit = dedupe_subject($prev_subj, \@subj, '" ');
+ my $end;
+ if (@subj) {
+ my $subj = join(' ', @subj);
+ $subj = ascii_html($subj);
+ obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
+ $end = "$subj $omit$f\n"
} else {
- $ctx->{seen}->{$h} = 1;
- $s = PublicInbox::Hval->new($s);
- $s = $s->as_html;
+ $end = "$f\n";
}
my $m;
my $id = '';
my $mapping = $ctx->{mapping};
- my $end = defined($s) ? "$s $f\n" : "$f\n";
if ($mapping) {
my $map = $mapping->{$mid};
$id = id_compress($mid, 1);
@@ -847,10 +938,10 @@ sub _skel_ghost {
$$dst .= $d;
}
-sub sort_ts {
+sub sort_ds {
[ sort {
- (eval { $a->topmost->{smsg}->ts } || 0) <=>
- (eval { $b->topmost->{smsg}->ts } || 0)
+ (eval { $a->topmost->{smsg}->ds } || 0) <=>
+ (eval { $b->topmost->{smsg}->ds } || 0)
} @{$_[0]} ];
}
@@ -860,22 +951,22 @@ sub acc_topic {
my ($ctx, $level, $node) = @_;
my $srch = $ctx->{srch};
my $mid = $node->{id};
- my $x = $node->{smsg} || $srch->lookup_mail($mid);
- my ($subj, $ts);
+ my $x = $node->{smsg} || $ctx->{-inbox}->smsg_by_mid($mid);
+ my ($subj, $ds);
my $topic;
if ($x) {
$subj = $x->subject;
$subj = $srch->subject_normalized($subj);
- $ts = $x->ts;
+ $ds = $x->ds;
if ($level == 0) {
- $topic = [ $ts, 1, { $subj => $mid }, $subj ];
+ $topic = [ $ds, 1, { $subj => $mid }, $subj ];
$ctx->{-cur_topic} = $topic;
push @{$ctx->{order}}, $topic;
return;
}
$topic = $ctx->{-cur_topic}; # should never be undef
- $topic->[0] = $ts if $ts > $topic->[0];
+ $topic->[0] = $ds if $ds > $topic->[0];
$topic->[1]++;
my $seen = $topic->[2];
if (scalar(@$topic) == 3) { # parent was a ghost
@@ -894,23 +985,27 @@ sub acc_topic {
sub dump_topics {
my ($ctx) = @_;
- my $order = delete $ctx->{order}; # [ ts, subj1, subj2, subj3, ... ]
+ my $order = delete $ctx->{order}; # [ ds, subj1, subj2, subj3, ... ]
if (!@$order) {
$ctx->{-html_tip} = '[No topics in range]
';
return 404;
}
my @out;
+ my $ibx = $ctx->{-inbox};
+ my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
+ my $srch = $ctx->{srch};
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
- my ($ts, $n, $seen, $top, @ex) = @$topic;
+ my ($ds, $n, $seen, $top, @ex) = @$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;
- $ts = fmt_ts($ts);
+ $ds = fmt_ts($ds);
# $n isn't the total number of posts on the topic,
# just the number of posts in the current results window
@@ -926,15 +1021,20 @@ sub dump_topics {
my $mbox = qq(mbox.gz);
my $atom = qq(Atom);
my $s = "$top\n" .
- " $ts UTC $n - $mbox / $atom\n";
+ " $ds UTC $n - $mbox / $atom\n";
for (my $i = 0; $i < scalar(@ex); $i += 2) {
my $level = $ex[$i];
- my $sub = $ex[$i + 1];
- $mid = delete $seen->{$sub};
- $sub = PublicInbox::Hval->new($sub)->as_html;
+ my $subj = $ex[$i + 1];
+ $mid = delete $seen->{$subj};
+ my @subj = split(/ /, $srch->subject_normalized($subj));
+ my @next_prev = @subj; # full copy
+ my $omit = dedupe_subject($prev_subj, \@subj, ' "');
+ $prev_subj = \@next_prev;
+ $subj = ascii_html(join(' ', @subj));
+ obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
$href = mid_escape($mid);
$s .= indent_for($level) . TCHILD;
- $s .= "$sub\n";
+ $s .= "$subj$omit\n";
}
push @out, $s;
}
@@ -969,17 +1069,31 @@ sub index_nav { # callback for WwwStream
sub index_topics {
my ($ctx) = @_;
my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/);
- my $opts = { offset => $off, limit => 200 };
+ my $lim = 200;
+ my $opts = { offset => $off, limit => $lim };
$ctx->{order} = [];
my $srch = $ctx->{srch};
- my $sres = $srch->query('', $opts);
+
+ my $qs = '';
+ # this complicated bit cuts loading time by over 400ms on my system:
+ if ($off == 0) {
+ my ($min, $max) = $ctx->{-inbox}->mm->minmax;
+ my $n = $max - $lim;
+ $n = $min if $n < $min;
+ for (; $qs eq '' && $n >= $min; --$n) {
+ my $smsg = $srch->lookup_article($n) or next;
+ $qs = POSIX::strftime('d:%Y%m%d..', gmtime($smsg->ts));
+ }
+ }
+
+ my $sres = $srch->query($qs, $opts);
my $nr = scalar @{$sres->{msgs}};
if ($nr) {
$sres = load_results($srch, $sres);
- walk_thread(thread_results($sres), $ctx, *acc_topic);
+ walk_thread(thread_results($ctx, $sres), $ctx, *acc_topic);
}
- $ctx->{-next_o} = $off+ $nr;
+ $ctx->{-next_o} = $off + $nr;
$ctx->{-cur_o} = $off;
PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav);
}