my $id_m = 'm'.$id;
my $root_anchor = $ctx->{root_anchor} || '';
- my $irt = in_reply_to($hdr);
+ my $irt;
my $rv = "<a\nhref=#e$id\nid=m$id>*</a> ";
$subj = '<b>'.ascii_html($subj).'</b>';
$subj = "<u\nid=u>$subj</u>" if $root_anchor eq $id_m;
$rv .= $subj . "\n";
- $rv .= _th_index_lite($mid_raw, $irt, $id, $ctx);
+ $rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
my @tocc;
foreach my $f (qw(To Cc)) {
my $dst = _hdr_names($hdr, $f);
$rv .= ' '.join('; +', @tocc) . "\n" if @tocc;
my $mapping = $ctx->{mapping};
- if (!$mapping && $irt) {
+ if (!$mapping && (defined($irt) || defined($irt = in_reply_to($hdr)))) {
my $mirt = PublicInbox::Hval->new_msgid($irt);
my $href = $upfx . $mirt->{href}. '/';
my $html = $mirt->as_html;
my $rv = '';
my $mapping = $ctx->{mapping} or return $rv;
my $pad = ' ';
- # map = [children, attr, node, idx, level]
- my $map = $mapping->{$mid_raw};
- my $nr_c = scalar @{$map->[0]};
+ my ($attr, $node, $idx, $level) = @{$mapping->{$mid_raw}};
+ my $children = $node->{children};
+ my $nr_c = scalar @$children;
my $nr_s = 0;
- my $level = $map->[4];
- my $idx = $map->[3];
- my $irt_map = $mapping->{$irt} if defined $irt;
+ my $siblings;
+ if (my $smsg = $node->{smsg}) {
+ ($$irt) = (($smsg->{references} || '') =~ m/<([^>]+)>\z/);
+ }
+ my $irt_map = $mapping->{$$irt} if defined $$irt;
if (defined $irt_map) {
- my $siblings = $irt_map->[0];
+ $siblings = $irt_map->[1]->{children};
$nr_s = scalar(@$siblings) - 1;
- $rv .= $pad . $irt_map->[1];
+ $rv .= $pad . $irt_map->[0];
if ($idx > 0) {
my $prev = $siblings->[$idx - 1];
my $pmid = $prev->{id};
$rv .= pad_link($pmid, $level, $s);
} elsif ($idx == 2) {
my $ppmid = $siblings->[0]->{id};
- $rv .= $pad . $mapping->{$ppmid}->[1];
+ $rv .= $pad . $mapping->{$ppmid}->[0];
}
- $rv .= $pad . $mapping->{$pmid}->[1];
+ $rv .= $pad . $mapping->{$pmid}->[0];
}
}
my $s_s = nr_to_s($nr_s, 'sibling', 'siblings');
my $s_c = nr_to_s($nr_c, 'reply', 'replies');
- my $this = $map->[1];
- $this =~ s!\n\z!</b>\n!s;
- $this =~ s!<a\nhref.*</a> !!s; # no point in duplicating subject
- $this =~ s!<a\nhref=[^>]+>([^<]+)</a>!$1!s; # no point linking to self
- $rv .= "<b>@ $this";
- my $node = $map->[2];
- if (my $child = $node->{child}) {
- my $cmid = $child->{id};
- $rv .= $pad . $mapping->{$cmid}->[1];
+ $attr =~ s!\n\z!</b>\n!s;
+ $attr =~ s!<a\nhref.*</a> !!s; # no point in duplicating subject
+ $attr =~ s!<a\nhref=[^>]+>([^<]+)</a>!$1!s; # no point linking to self
+ $rv .= "<b>@ $attr";
+ if ($nr_c) {
+ my $cmid = $children->[0]->{id};
+ $rv .= $pad . $mapping->{$cmid}->[0];
if ($nr_c > 2) {
my $s = ($nr_c - 1). ' more replies';
$rv .= pad_link($cmid, $level + 1, $s);
- } elsif (my $cn = $child->{next}) {
- $rv .= $pad . $mapping->{$cn->{id}}->[1];
+ } elsif (my $cn = $children->[1]) {
+ $rv .= $pad . $mapping->{$cn->{id}}->[0];
}
}
- if (my $next = $node->{next}) {
+
+ my $next = $siblings->[$idx+1] if $siblings && $idx >= 0;
+ if ($next) {
my $nmid = $next->{id};
- $rv .= $pad . $mapping->{$nmid}->[1];
+ $rv .= $pad . $mapping->{$nmid}->[0];
my $nnext = $nr_s - $idx;
if ($nnext > 2) {
my $s = ($nnext - 1).' subsequent siblings';
$rv .= pad_link($nmid, $level, $s);
- } elsif (my $nn = $next->{next}) {
- $rv .= $pad . $mapping->{$nn->{id}}->[1];
+ } elsif (my $nn = $siblings->[$idx + 2]) {
+ $rv .= $pad . $mapping->{$nn->{id}}->[0];
}
}
$rv .= $pad ."<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
sub walk_thread {
my ($th, $ctx, $cb) = @_;
- my @q = map { (0, $_) } @{$th->{rootset}};
+ my @q = map { (0, $_, -1) } @{$th->{rootset}};
while (@q) {
- my $level = shift @q;
- my $node = shift @q or next;
- $cb->($ctx, $level, $node);
- unshift @q, $level+1, $node->{child}, $level, $node->{next};
+ my ($level, $node, $i) = splice(@q, 0, 3);
+ defined $node or next;
+ $cb->($ctx, $level, $node, $i);
+ ++$level;
+ $i = 0;
+ unshift @q, map { ($level, $_, $i++) } @{$node->{children}};
}
}
sub pre_thread {
- my ($ctx, $level, $node) = @_;
- my $mapping = $ctx->{mapping};
- my $idx = -1;
- if (my $parent = $node->{parent}) {
- my $m = $mapping->{$parent->{id}}->[0];
- $idx = scalar @$m;
- push @$m, $node;
- }
- $mapping->{$node->{id}} = [ [], '', $node, $idx, $level ];
+ my ($ctx, $level, $node, $idx) = @_;
+ $ctx->{mapping}->{$node->{id}} = [ '', $node, $idx, $level ];
skel_dump($ctx, $level, $node);
}
while (@q) {
$level = shift @q;
my $node = shift @q or next;
- unshift @q, $level+1, $node->{child}, $level, $node->{next};
+ my $cl = $level + 1;
+ unshift @q, map { ($cl, $_) } @{$node->{children}};
$mime = $inbox->msg_by_smsg($node->{smsg}) and last;
}
return missing_thread($ctx) unless $mime;
while (@q) {
$level = shift @q;
my $node = shift @q or next;
- unshift @q, $level+1, $node->{child},
- $level, $node->{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);
push(@arg, map { "--cc=$_" } @cc);
my $cc = uri_escape_utf8(join(',', @cc));
my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj";
- $href =~ s/%20/+/g;
(\@arg, ascii_html($href));
}
sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
-sub _skel_header {
- my ($ctx, $smsg, $level) = @_;
+sub skel_dump {
+ my ($ctx, $level, $node) = @_;
+ my $smsg = $node->{smsg} or return _skel_ghost($ctx, $level, $node);
my $dst = $ctx->{dst};
my $cur = $ctx->{cur};
my $map = $mapping->{$mid};
$id = id_compress($mid, 1);
$m = '#m'.$id;
- $map->[1] = "$d<a\nhref=\"$m\">$end";
+ $map->[0] = "$d<a\nhref=\"$m\">$end";
$id = "\nid=r".$id;
} else {
$m = $ctx->{-upfx}.mid_escape($mid).'/';
$$dst .= $d . "<a\nhref=\"$m\"$id>" . $end;
}
-sub skel_dump {
+sub _skel_ghost {
my ($ctx, $level, $node) = @_;
- if (my $smsg = $node->{smsg}) {
- _skel_header($ctx, $smsg, $level);
+
+ my $mid = $node->{id};
+ 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->{href} . '/';
+ my $html = $m->as_html;
+
+ my $mapping = $ctx->{mapping};
+ my $map = $mapping->{$mid} if $mapping;
+ if ($map) {
+ my $id = id_compress($mid, 1);
+ $map->[0] = $d . qq{<<a\nhref=#r$id>$html</a>>\n};
+ $d .= qq{<<a\nhref="$href"\nid=r$id>$html</a>>\n};
} else {
- my $mid = $node->{id};
- my $dst = $ctx->{dst};
- my $mapping = $ctx->{mapping};
- my $map = $mapping->{$mid} if $mapping;
- 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->{href} . '/';
- my $html = $m->as_html;
-
- if ($map) {
- my $id = id_compress($mid, 1);
- $map->[1] = $d . qq{<<a\nhref=#r$id>$html</a>>\n};
- $d .= qq{<<a\nhref="$href"\nid=r$id>$html</a>>\n};
- } else {
- $d .= qq{<<a\nhref="$href">$html</a>>\n};
- }
- $$dst .= $d;
+ $d .= qq{<<a\nhref="$href">$html</a>>\n};
}
+ my $dst = $ctx->{dst};
+ $$dst .= $d;
}
sub sort_ts {