"; # anchor for body start
-
- if ($srch) {
+sub _msg_page_prepare_obuf {
+ my ($hdr, $ctx, $nr) = @_;
+ my $over = $ctx->{-inbox}->over;
+ my $obfs_ibx = $ctx->{-obfs_ibx};
+ my $rv = '';
+ my $mids = mids_for_index($hdr);
+ if ($nr == 0) {
+ if ($ctx->{more}) {
+ $rv .=
+"WARNING: multiple messages have this Message-ID\n
";
+ }
+ $rv .= ""; # anchor for body start
+ } else {
+ $rv .= '';
+ }
+ if ($over) {
$ctx->{-upfx} = '../';
}
- my @title;
- my $mid = $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;
- $v = PublicInbox::Hval->new($v);
-
- if ($h eq 'From') {
- my @n = PublicInbox::Address::names($v->raw);
- $title[1] = ascii_html(join(', ', @n));
- } elsif ($h eq 'Subject') {
- $title[0] = $v->as_html;
- if ($srch) {
- $rv .= qq($h: );
- $rv .= $v->as_html . "\n";
- next;
- }
+ my @title; # (Subject[0], From[0])
+ for my $v ($hdr->header('From')) {
+ my @n = PublicInbox::Address::names($v);
+ $v = ascii_html($v);
+ $title[1] //= ascii_html(join(', ', @n));
+ if ($obfs_ibx) {
+ obfuscate_addrs($obfs_ibx, $v);
+ obfuscate_addrs($obfs_ibx, $title[1]);
}
- $v = $v->as_html;
- $v =~ s/(\@[^,]+,) /$1\n\t/g if ($h eq 'Cc' || $h eq 'To');
- $rv .= "$h: $v\n";
-
+ $rv .= "From: $v\n" if $v ne '';
+ }
+ foreach my $h (qw(To Cc)) {
+ for my $v ($hdr->header($h)) {
+ fold_addresses($v);
+ $v = ascii_html($v);
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
+ $rv .= "$h: $v\n" if $v ne '';
+ }
+ }
+ my @subj = $hdr->header('Subject');
+ if (@subj) {
+ my $v = ascii_html(shift @subj);
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
+ $rv .= 'Subject: ';
+ $rv .= $over ? qq($v\n) : "$v\n";
+ $title[0] = $v;
+ for $v (@subj) { # multi-Subject message :<
+ $v = ascii_html($v);
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
+ $rv .= "Subject: $v\n";
+ }
+ } else { # dummy anchor for thread skeleton at bottom of page
+ $rv .= qq() if $over;
+ $title[0] = '(no subject)';
+ }
+ for my $v ($hdr->header('Date')) {
+ $v = ascii_html($v);
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P
+ $rv .= "Date: $v\n";
}
- $title[0] ||= '(no subject)';
$ctx->{-title_html} = join(' - ', @title);
- $rv .= 'Message-ID: <' . $mid->as_html . '> ';
- $rv .= "(raw)\n";
- $rv .= _parent_headers($hdr, $srch);
+ if (scalar(@$mids) == 1) { # common case
+ my $mhtml = ascii_html($mids->[0]);
+ $rv .= "Message-ID: <$mhtml> ";
+ $rv .= "(raw)\n";
+ } else {
+ # X-Alt-Message-ID can happen if a message is injected from
+ # public-inbox-nntpd because of multiple Message-ID headers.
+ my $lnk = PublicInbox::Linkify->new;
+ my $s = '';
+ for my $h (qw(Message-ID X-Alt-Message-ID)) {
+ $s .= "$h: $_\n" for ($hdr->header_raw($h));
+ }
+ $lnk->linkify_mids('..', \$s, 1);
+ $rv .= $s;
+ }
+ $rv .= _parent_headers($hdr, $over);
$rv .= "\n";
+ \$rv;
}
-sub thread_skel {
- my ($dst, $ctx, $hdr, $tpfx) = @_;
- my $srch = $ctx->{srch};
- my $mid = mid_clean($hdr->header_raw('Message-ID'));
- my $sres = $srch->get_thread($mid);
- my $nr = $sres->{total};
- my $expand = qq(expand ) .
- qq(/ mbox.gz ) .
- qq(/ Atom feed);
+sub SKEL_EXPAND () {
+ qq(expand[flat) .
+ qq(|nested] ) .
+ qq(mbox.gz ) .
+ qq(Atom feed);
+}
+sub thread_skel ($$$) {
+ my ($skel, $ctx, $hdr) = @_;
+ my $mid = mids($hdr)->[0];
+ my $ibx = $ctx->{-inbox};
+ my ($nr, $msgs) = $ibx->over->get_thread($mid);
my $parent = in_reply_to($hdr);
+ $$skel .= "\nThread overview: ";
if ($nr <= 1) {
if (defined $parent) {
- $$dst .= "($expand)\n ";
- $$dst .= ghost_parent("$tpfx../", $parent) . "\n";
+ $$skel .= SKEL_EXPAND."\n ";
+ $$skel .= ghost_parent('../', $parent) . "\n";
} else {
- $$dst .= "[no followups, yet] ($expand)\n";
+ $$skel .= '[no followups] '.SKEL_EXPAND."\n";
}
$ctx->{next_msg} = undef;
$ctx->{parent_msg} = $parent;
return;
}
- $$dst .= "$nr+ messages in thread ($expand";
- $$dst .= qq! / [top])\n!;
+ $$skel .= $nr;
+ $$skel .= '+ messages / '.SKEL_EXPAND.qq! top\n!;
- my $subj = $srch->subject_path($hdr->header('Subject'));
- $ctx->{seen} = { $subj => 1 };
+ # nb: mutt only shows the first Subject in the index pane
+ # when multiple Subject: headers are present, so we follow suit:
+ my $subj = $hdr->header('Subject') // '';
+ $subj = '(no subject)' if $subj eq '';
+ $ctx->{prev_subj} = [ split(/ /, subject_normalized($subj)) ];
$ctx->{cur} = $mid;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
- $ctx->{dst} = $dst;
- walk_thread(thread_results(load_results($sres)), $ctx, *skel_dump);
+ $ctx->{skel} = $skel;
+
+ # reduce hash lookups in skel_dump
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
+ walk_thread(thread_results($ctx, $msgs), $ctx, \&skel_dump);
+
$ctx->{parent_msg} = $parent;
}
sub _parent_headers {
- my ($hdr, $srch) = @_;
+ my ($hdr, $over) = @_;
my $rv = '';
-
- my $irt = in_reply_to($hdr);
- if (defined $irt) {
- my $v = PublicInbox::Hval->new_msgid($irt);
- my $html = $v->as_html;
- my $href = $v->as_href;
- $rv .= "In-Reply-To: <";
- $rv .= "$html>\n";
+ my @irt = $hdr->header_raw('In-Reply-To');
+ my $refs;
+ if (@irt) {
+ my $lnk = PublicInbox::Linkify->new;
+ $rv .= "In-Reply-To: $_\n" for @irt;
+ $lnk->linkify_mids('..', \$rv);
+ } else {
+ $refs = references($hdr);
+ my $irt = pop @$refs;
+ if (defined $irt) {
+ my $html = ascii_html($irt);
+ my $href = mid_href($irt);
+ $rv .= "In-Reply-To: <";
+ $rv .= "$html>\n";
+ }
}
# do not display References: if search is present,
# we show the thread skeleton at the bottom, instead.
- return $rv if $srch;
-
- my $refs = $hdr->header_raw('References');
- if ($refs) {
- # avoid redundant URLs wasting bandwidth
- my %seen;
- $seen{$irt} = 1 if defined $irt;
- my @refs;
- my @raw_refs = ($refs =~ /<([^>]+)>/g);
- foreach my $ref (@raw_refs) {
- next if $seen{$ref};
- $seen{$ref} = 1;
- push @refs, linkify_ref_nosrch($ref);
- }
+ return $rv if $over;
- if (@refs) {
- $rv .= 'References: '. join("\n\t", @refs) . "\n";
- }
+ $refs //= references($hdr);
+ if (@$refs) {
+ @$refs = map { linkify_ref_no_over($_) } @$refs;
+ $rv .= 'References: '. join("\n\t", @$refs) . "\n";
}
$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='.ascii_html(squote_maybe(mid_clean($mid)));
- my $irt = uri_escape_utf8($mid);
- delete $cc{$to};
- push @arg, '--to=' . ascii_html($to);
- $to = uri_escape_utf8($to);
- $subj = uri_escape_utf8($subj);
- my $cc = join(',', sort values %cc);
- push @arg, '--cc=' . ascii_html($cc);
- $cc = uri_escape_utf8($cc);
- my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj";
- $href =~ s/%20/+/g;
-
- (\@arg, ascii_html($href));
-}
-
+# returns a string buffer via ->getline
sub html_footer {
- my ($hdr, $standalone, $ctx, $rhref) = @_;
-
- my $srch = $ctx->{srch} if $ctx;
+ my ($ctx, $hdr) = @_;
+ my $ibx = $ctx->{-inbox};
my $upfx = '../';
- my $tpfx = '';
- my $idx = $standalone ? " index" : '';
- my $irt = '';
- if ($idx && $srch) {
- $idx .= "\n";
- thread_skel(\$idx, $ctx, $hdr, $tpfx);
- my $p = $ctx->{parent_msg};
- my $next = $ctx->{next_msg};
- if ($p) {
- $p = PublicInbox::Hval->new_msgid($p);
- $p = $p->as_href;
- $irt = "parent ";
- } else {
- $irt = ' ' x length('parent ');
+ my $skel = " index";
+ my $rv = '';
+ if ($ibx->over) {
+ $skel .= "\n";
+ thread_skel(\$skel, $ctx, $hdr);
+ my ($next, $prev);
+ my $parent = ' ';
+ $next = $prev = ' ';
+
+ if (my $n = $ctx->{next_msg}) {
+ $n = mid_href($n);
+ $next = "next";
}
- if ($next) {
- my $n = PublicInbox::Hval->new_msgid($next)->as_href;
- $irt .= "next ";
- } else {
- $irt .= ' ' x length('next ');
+ my $u;
+ my $par = $ctx->{parent_msg};
+ if ($par) {
+ $u = mid_href($par);
+ $u = "$upfx$u/";
}
- } else {
- $irt = '';
+ if (my $p = $ctx->{prev_msg}) {
+ $prev = mid_href($p);
+ if ($p && $par && $p eq $par) {
+ $prev = "prev parent';
+ $parent = '';
+ } else {
+ $prev = "prev';
+ $parent = " parent" if $u;
+ }
+ } elsif ($u) { # unlikely
+ $parent = " parent";
+ }
+ $rv .= "$next $prev$parent ";
}
- $rhref ||= '#R';
- $irt .= qq(reply);
- $irt .= $idx;
+ $rv .= qq(reply);
+ $rv .= $skel;
+ $rv .= '
';
+ $rv .= msg_reply($ctx, $hdr);
}
-sub linkify_ref_nosrch {
- my $v = PublicInbox::Hval->new_msgid($_[0]);
- my $html = $v->as_html;
- my $href = $v->as_href;
+sub linkify_ref_no_over {
+ my ($mid) = @_;
+ my $href = mid_href($mid);
+ my $html = ascii_html($mid);
"<$html>";
}
@@ -673,39 +819,66 @@ 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->as_href;
- my $html = $mid->as_html;
+ my $href = mid_href($mid);
+ my $html = ascii_html($mid);
qq{[parent not found: <$html>]};
}
sub indent_for {
my ($level) = @_;
- INDENT x ($level - 1);
+ $level ? INDENT x ($level - 1) : '';
}
-sub load_results {
- my ($sres) = @_;
-
- [ map { $_->mini_mime } @{delete $sres->{msgs}} ];
+sub find_mid_root {
+ my ($ctx, $level, $node, $idx) = @_;
+ ++$ctx->{root_idx} if $level == 0;
+ if ($node->{id} eq $ctx->{mid}) {
+ $ctx->{found_mid_at} = $ctx->{root_idx};
+ return 0;
+ }
+ 1;
}
-sub msg_timestamp {
- my ($hdr) = @_;
- my $ts = eval { str2time($hdr->header('Date')) };
- defined($ts) ? $ts : 0;
+sub strict_loose_note ($) {
+ my ($nr) = @_;
+ my $msg =
+" -- strict thread matches above, loose matches on Subject: below --\n";
+
+ if ($nr > PublicInbox::Over::DEFAULT_LIMIT()) {
+ $msg .=
+" -- use mbox.gz link to download all $nr messages --\n";
+ }
+ $msg;
}
sub thread_results {
- my ($msgs) = @_;
- require PublicInbox::Thread;
- my $th = PublicInbox::Thread->new(@$msgs);
- $th->thread;
- $th->order(*sort_ts);
- $th
+ my ($ctx, $msgs) = @_;
+ require PublicInbox::SearchThread;
+ my $rootset = PublicInbox::SearchThread::thread($msgs, \&sort_ds, $ctx);
+
+ # FIXME: `tid' is broken on --reindex, so that needs to be fixed
+ # and preserved in the future. This bug is hidden by `sid' matches
+ # in get_thread, so we never noticed it until now. And even when
+ # reindexing is fixed, we'll keep this code until a SCHEMA_VERSION
+ # bump since reindexing is expensive and users may not do it
+
+ # loose threading could've returned too many results,
+ # put the root the message we care about at the top:
+ my $mid = $ctx->{mid};
+ if (defined($mid) && scalar(@$rootset) > 1) {
+ $ctx->{root_idx} = -1;
+ my $nr = scalar @$msgs;
+ walk_thread($rootset, $ctx, \&find_mid_root);
+ my $idx = $ctx->{found_mid_at};
+ if (defined($idx) && $idx != 0) {
+ my $tip = splice(@$rootset, $idx, 1);
+ @$rootset = reverse @$rootset;
+ unshift @$rootset, $tip;
+ $ctx->{sl_note} = strict_loose_note($nr);
+ }
+ }
+ $rootset
}
sub missing_thread {
@@ -714,22 +887,52 @@ sub missing_thread {
PublicInbox::ExtMsg::ext_msg($ctx);
}
-sub _msg_date {
- my ($hdr) = @_;
- my $ts = $hdr->header('X-PI-TS') || msg_timestamp($hdr);
- fmt_ts($ts);
-}
+sub dedupe_subject {
+ my ($prev_subj, $subj, $val) = @_;
-sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
+ 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_header {
- my ($ctx, $hdr, $level) = @_;
+sub skel_dump { # walk_thread callback
+ 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 = mid_clean($hdr->header_raw('Message-ID'));
- my $f = ascii_html($hdr->header('X-PI-From'));
- my $d = _msg_date($hdr) . ' ' . indent_for($level) . th_pfx($level);
+ my $mid = $smsg->{mid};
+
+ if ($level == 0 && $ctx->{skel_dump_roots}++) {
+ $$skel .= delete($ctx->{sl_note}) || '';
+ }
+
+ my $f = ascii_html($smsg->{from_name});
+ my $obfs_ibx = $ctx->{-obfs_ibx};
+ obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
+
+ my $d = fmt_ts($smsg->{ds});
+ my $unmatched; # if lazy-loaded by SearchThread::Msg::visible()
+ if (exists $ctx->{searchview}) {
+ if (defined(my $pct = $smsg->{pct})) {
+ $d .= (sprintf(' % 2u', $pct) . '%');
+ } else {
+ $unmatched = 1;
+ $d .= ' ';
+ }
+ }
+ $d .= ' ' . indent_for($level) . th_pfx($level);
my $attr = $f;
$ctx->{first_level} ||= $level;
@@ -741,9 +944,11 @@ sub _skel_header {
if ($cur) {
if ($cur eq $mid) {
delete $ctx->{cur};
- $$dst .= "$d".
+ $$skel .= "$d".
"$attr [this message]\n";
- return;
+ return 1;
+ } else {
+ $ctx->{prev_msg} = $mid;
}
} else {
$ctx->{next_msg} ||= $mid;
@@ -752,202 +957,236 @@ sub _skel_header {
# 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 = $hdr->header('Subject');
- my $h = $ctx->{srch}->subject_path($s);
- if ($ctx->{seen}->{$h}) {
- $s = undef;
+ 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} || [];
+ $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 = PublicInbox::Hval->new_msgid($mid);
+ my $m;
my $id = '';
- my $mapping = $ctx->{mapping};
- my $end = defined($s) ? "$s $f\n" : "$f\n";
+ my $mapping = $unmatched ? undef : $ctx->{mapping};
if ($mapping) {
my $map = $mapping->{$mid};
$id = id_compress($mid, 1);
$m = '#m'.$id;
- $map->[1] = "$d$end";
+ $map->[0] = "$d$end";
$id = "\nid=r".$id;
} else {
- $m = $ctx->{-upfx}.$m->as_href.'/';
+ $m = $ctx->{-upfx}.mid_href($mid).'/';
}
- $$dst .= $d . "" . $end;
+ $$skel .= $d . "" . $end;
+ 1;
}
-sub skel_dump {
+sub _skel_ghost {
my ($ctx, $level, $node) = @_;
- if (my $mime = $node->message) {
- _skel_header($ctx, $mime->header_obj, $level);
+
+ my $mid = $node->{id};
+ my $d = ' [not found] ';
+ $d .= ' ' if exists $ctx->{searchview};
+ $d .= indent_for($level) . th_pfx($level);
+ my $upfx = $ctx->{-upfx};
+ my $href = $upfx . mid_href($mid) . '/';
+ my $html = ascii_html($mid);
+
+ my $mapping = $ctx->{mapping};
+ my $map = $mapping->{$mid} if $mapping;
+ if ($map) {
+ my $id = id_compress($mid, 1);
+ $map->[0] = $d . qq{<$html>\n};
+ $d .= qq{<$html>\n};
} else {
- my $mid = $node->messageid;
- 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);
- my $upfx = $ctx->{-upfx};
- my $m = PublicInbox::Hval->new_msgid($mid);
- my $href = $upfx . $m->as_href . '/';
- my $html = $m->as_html;
-
- if ($map) {
- my $id = id_compress($mid, 1);
- $map->[1] = $d . qq{<$html>\n};
- $d .= qq{<$html>\n};
- } else {
- $d .= qq{<$html>\n};
- }
- $$dst .= $d;
+ $d .= qq{<$html>\n};
}
+ ${$ctx->{skel}} .= $d;
+ 1;
}
-sub sort_ts {
- sort {
- (eval { $a->topmost->message->header('X-PI-TS') } || 0) <=>
- (eval { $b->topmost->message->header('X-PI-TS') } || 0)
- } @_;
-}
-
-sub _tryload_ghost ($$) {
- my ($srch, $mid) = @_;
- my $smsg = $srch->lookup_mail($mid) or return;
- $smsg->mini_mime;
+sub sort_ds {
+ [ sort {
+ (eval { $a->topmost->{smsg}->{ds} } || 0) <=>
+ (eval { $b->topmost->{smsg}->{ds} } || 0)
+ } @{$_[0]} ];
}
# accumulate recent topics if search is supported
-# returns 1 if done, undef if not
-sub add_topic {
+# returns 200 if done, 404 if not
+sub acc_topic { # walk_thread callback
my ($ctx, $level, $node) = @_;
- my $srch = $ctx->{srch};
- my $mid = $node->messageid;
- my $x = $node->message || _tryload_ghost($srch, $mid);
- my ($subj, $ts);
- if ($x) {
- $x = $x->header_obj;
- $subj = $x->header('Subject');
- $subj = $srch->subject_normalized($subj);
- $ts = $x->header('X-PI-TS');
- } else { # ghost message, do not bump level
- $ts = -666;
- $subj = "<$mid>";
- }
- if (++$ctx->{subjs}->{$subj} == 1) {
- push @{$ctx->{order}}, [ $level, $subj ];
- }
- my $exist = $ctx->{latest}->{$subj};
- if (!$exist || $exist->[1] < $ts) {
- $ctx->{latest}->{$subj} = [ $mid, $ts ];
+ my $mid = $node->{id};
+ my $smsg = $node->{smsg} // $ctx->{-inbox}->smsg_by_mid($mid);
+ if ($smsg) {
+ my $subj = subject_normalized($smsg->{subject});
+ $subj = '(no subject)' if $subj eq '';
+ 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;
+ }
+
+ # continue existing topic
+ my $topic = $ctx->{-cur_topic}; # should never be undef
+ $topic->[0] = $ds if $ds > $topic->[0];
+ $topic->[1]++; # bump N+ message counter
+ my $seen = $topic->[2];
+ if (scalar(@$topic) == 3) { # parent was a ghost
+ push @$topic, $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
+ my $topic = $ctx->{-cur_topic} = [ -666, 0, {} ];
+ push @{$ctx->{order}}, $topic;
}
+ 1;
}
-sub topics {
+sub dump_topics {
my ($ctx) = @_;
- my $order = $ctx->{order};
- my $subjs = $ctx->{subjs};
- my $latest = $ctx->{latest};
- if (!@$order) {
+ my $order = delete $ctx->{order}; # [ ds, subj1, subj2, subj3, ... ]
+ unless ($order) {
$ctx->{-html_tip} = '[No topics in range]
';
return 404;
}
- my $pfx;
- my $prev = 0;
- my $prev_attr = '';
- my $cur;
- my @recent;
- while (defined(my $info = shift @$order)) {
- my ($level, $subj) = @$info;
- my $n = delete $subjs->{$subj};
- my ($mid, $ts) = @{delete $latest->{$subj}};
- my $href = PublicInbox::Hval->new_msgid($mid)->as_href;
- $pfx = indent_for($level);
- my $nl = $level == $prev ? "\n" : '';
- if ($nl && $cur) {
- push @recent, $cur;
- $cur = undef;
- }
- $cur ||= [ $ts, '' ];
- $cur->[0] = $ts if $ts > $cur->[0];
- $cur->[1] .= $nl . $pfx . th_pfx($level);
- if ($ts == -666) { # ghost
- $cur->[1] .= ghost_parent('', $mid) . "\n";
- next; # child will have mbox / atom link
- }
- $subj = PublicInbox::Hval->new($subj)->as_html;
- $cur->[1] .= "$subj\n";
- $ts = fmt_ts($ts);
- my $attr = " $ts UTC";
+ my @out;
+ my $ibx = $ctx->{-inbox};
+ my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
+
+ # 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_subj, @extra) = @$topic;
+ @$topic = ();
+ 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,
# just the number of posts in the current results window
- $n = $n == 1 ? '' : " ($n+ messages)";
-
- if ($level == 0 || $attr ne $prev_attr) {
- my $mbox = qq(mbox.gz);
- my $atom = qq(Atom);
- $pfx .= INDENT if $level > 0;
- $cur->[1] .= $pfx . $attr . $n . " - $mbox / $atom\n";
- $prev_attr = $attr;
+ my $anchor;
+ if ($n == 1) {
+ $n = '';
+ $anchor = '#u'; # top of only message
+ } else {
+ $n = " ($n+ messages)";
+ $anchor = '#t'; # thread skeleton
}
+
+ my $mbox = qq(mbox.gz);
+ my $atom = qq(Atom);
+ my $s = "$top_subj\n" .
+ " $ds UTC $n - $mbox / $atom\n";
+ 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(/ /, $subj);
+ my @next_prev = @subj; # full copy
+ my $omit = dedupe_subject($prev_subj, \@subj, ' "');
+ $prev_subj = \@next_prev;
+ $subj = ascii_html($subj);
+ obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
+ $href = mid_href($mid);
+ $s .= indent_for($level) . TCHILD;
+ $s .= qq($subj$omit\n);
+ }
+ push @out, $s;
}
- push @recent, $cur if $cur;
- @recent = map { $_->[1] } sort { $b->[0] <=> $a->[0] } @recent;
- $ctx->{-html_tip} = join('', '', @recent, '
');
+ $ctx->{-html_tip} = '' . join("\n", @out) . '
';
200;
}
+# only for the t= query parameter passed to overview DB
+sub ts2str ($) { strftime('%Y%m%d%H%M%S', gmtime($_[0])) };
+
+sub str2ts ($) {
+ my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $_[0]);
+ timegm($ss, $mm, $hh, $dd, $mon - 1, $yyyy);
+}
+
+sub pagination_footer ($$) {
+ my ($ctx, $latest) = @_;
+ delete $ctx->{qp} or return;
+ my $next = $ctx->{next_page} || '';
+ my $prev = $ctx->{prev_page} || '';
+ if ($prev) {
+ $next = $next ? "$next " : ' ';
+ $prev .= qq! latest!;
+ }
+ "
page: $next$prev
";
+}
+
sub index_nav { # callback for WwwStream
my (undef, $ctx) = @_;
- delete $ctx->{qp} or return;
- my ($next, $prev);
- $next = $prev = ' ';
- my $latest = '';
-
- my $next_o = $ctx->{-next_o};
- if ($next_o) {
- $next = qq!next!;
- }
- if (my $cur_o = $ctx->{-cur_o}) {
- $latest = qq! latest!;
-
- my $o = $cur_o - ($next_o - $cur_o);
- if ($o > 0) {
- $prev = qq!prev!;
- } elsif ($o == 0) {
- $prev = qq!prev!;
+ pagination_footer($ctx, '.')
+}
+
+sub paginate_recent ($$) {
+ my ($ctx, $lim) = @_;
+ my $t = $ctx->{qp}->{t} || '';
+ my $opts = { limit => $lim };
+ my ($after, $before);
+
+ # Xapian uses '..' but '-' is perhaps friendier to URL linkifiers
+ # if only $after exists "YYYYMMDD.." because "." could be skipped
+ # if interpreted as an end-of-sentence
+ $t =~ s/\A([0-9]{8,14})-// and $after = str2ts($1);
+ $t =~ /\A([0-9]{8,14})\z/ and $before = str2ts($1);
+
+ my $ibx = $ctx->{-inbox};
+ my $msgs = $ibx->recent($opts, $after, $before);
+ my $nr = scalar @$msgs;
+ if ($nr < $lim && defined($after)) {
+ $after = $before = undef;
+ $msgs = $ibx->recent($opts);
+ $nr = scalar @$msgs;
+ }
+ my $more = $nr == $lim;
+ my ($newest, $oldest);
+ if ($nr) {
+ $newest = $msgs->[0]->{ts};
+ $oldest = $msgs->[-1]->{ts};
+ # if we only had $after, our SQL query in ->recent ordered
+ if ($newest < $oldest) {
+ ($oldest, $newest) = ($newest, $oldest);
+ $more = 0 if defined($after) && $after < $oldest;
}
}
- "
page: $next $prev$latest
";
+ if (defined($oldest) && $more) {
+ my $s = ts2str($oldest);
+ $ctx->{next_page} = qq!next!;
+ }
+ if (defined($newest) && (defined($before) || defined($after))) {
+ my $s = ts2str($newest);
+ $ctx->{prev_page} = qq!prev!;
+ }
+ $msgs;
}
sub index_topics {
my ($ctx) = @_;
- my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/);
- my $order = $ctx->{order} = [];
- $ctx->{subjs} = {};
- $ctx->{latest} = {};
- my $max = 25;
- my %opts = ( offset => $off, limit => $max * 4 );
- while (scalar @{$ctx->{order}} < $max) {
- my $sres = $ctx->{srch}->query('', \%opts);
- my $nr = scalar @{$sres->{msgs}} or last;
- $sres = load_results($sres);
- walk_thread(thread_results($sres), $ctx, *add_topic);
- $opts{offset} += $nr;
- }
- $ctx->{-next_o} = $opts{offset};
- $ctx->{-cur_o} = $off;
- PublicInbox::WwwStream->response($ctx, topics($ctx), *index_nav);
+ my $msgs = paginate_recent($ctx, 200); # 200 is our window
+ if (@$msgs) {
+ walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
+ }
+ PublicInbox::WwwStream->response($ctx, dump_topics($ctx), \&index_nav);
}
sub thread_adj_level {
@@ -975,9 +1214,10 @@ sub thread_adj_level {
}
sub ghost_index_entry {
- my ($ctx, $level, $mid) = @_;
+ my ($ctx, $level, $node) = @_;
my ($beg, $end) = thread_adj_level($ctx, $level);
- $beg . ''. ghost_parent($ctx->{-upfx}, $mid) . '
' . $end;
+ $beg . ''. ghost_parent($ctx->{-upfx}, $node->{id})
+ . '
' . $end;
}
1;