* [PATCH 6/7] view: avoid links to unknown compressed Message-IDs
2015-09-02 6:59 7% [PATCH 0/7] improved thread views and 404 reductions Eric Wong
@ 2015-09-02 6:59 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2015-09-02 6:59 UTC (permalink / raw)
To: meta
Compressed Message-IDs are irreversible and may not be used
at other sites. So avoid compressing Message-IDs we do not
know about so users have a chance of finding the message in
other archives by doing a Message-ID lookup.
---
lib/PublicInbox/Hval.pm | 4 ++--
lib/PublicInbox/View.pm | 33 +++++++++++++++++++--------------
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index 21efe40..0445e57 100644
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -25,9 +25,9 @@ sub new {
}
sub new_msgid {
- my ($class, $msgid) = @_;
+ my ($class, $msgid, $no_compress) = @_;
$msgid = mid_clean($msgid);
- $class->new($msgid, mid_compress($msgid));
+ $class->new($msgid, $no_compress ? $msgid : mid_compress($msgid));
}
sub new_oneline {
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 98fc133..1528a87 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -132,7 +132,7 @@ sub index_entry {
if (defined $irt) {
unless (defined $parent_anchor) {
- my $v = PublicInbox::Hval->new_msgid($irt);
+ my $v = PublicInbox::Hval->new_msgid($irt, 1);
$v = $v->as_href;
$parent_anchor = "${path}$v/";
}
@@ -452,22 +452,25 @@ sub thread_inline {
if ($nr <= 1) {
$$dst .= "\n[no followups, yet]\n";
- return;
+ return (undef, in_reply_to($cur));
}
my $upfx = $full_pfx ? '' : '../';
$$dst .= "\n\n~$nr messages in thread: ".
"(<a\nhref=\"${upfx}t/#u\">expand</a>)\n";
my $subj = $srch->subject_path($cur->header('Subject'));
+ my $parent = in_reply_to($cur);
my $state = {
seen => { $subj => 1 },
srch => $srch,
cur => $mid,
+ parent_cmp => $parent ? mid_compress($parent) : '',
+ parent => $parent,
};
for (thread_results(load_results($res))->rootset) {
inline_dump($dst, $state, $upfx, $_, 0);
}
- $state->{next_msg};
+ ($state->{next_msg}, $state->{parent});
}
sub _parent_headers_nosrch {
@@ -476,7 +479,7 @@ sub _parent_headers_nosrch {
my $irt = in_reply_to($header_obj);
if (defined $irt) {
- my $v = PublicInbox::Hval->new_msgid($irt);
+ my $v = PublicInbox::Hval->new_msgid($irt, 1);
my $html = $v->as_html;
my $href = $v->as_href;
$rv .= "In-Reply-To: <";
@@ -493,7 +496,7 @@ sub _parent_headers_nosrch {
foreach my $ref (@raw_refs) {
next if $seen{$ref};
$seen{$ref} = 1;
- push @refs, linkify_ref($ref);
+ push @refs, linkify_ref_nosrch($ref);
}
if (@refs) {
@@ -536,12 +539,11 @@ sub html_footer {
my $upfx = $full_pfx ? '../' : '../../';
my $idx = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
if ($idx && $srch) {
- my $next = thread_inline(\$idx, $ctx, $mime, $full_pfx);
- $irt = in_reply_to($mime->header_obj);
- if (defined $irt) {
- $irt = PublicInbox::Hval->new_msgid($irt);
- $irt = $irt->as_href;
- $irt = "<a\nhref=\"$upfx$irt/\">parent</a> ";
+ my ($next, $p) = thread_inline(\$idx, $ctx, $mime, $full_pfx);
+ if (defined $p) {
+ $p = PublicInbox::Hval->new_oneline($p);
+ $p = $p->as_href;
+ $irt = "<a\nhref=\"$upfx$p/\">parent</a> ";
} else {
$irt = ' ' x length('parent ');
}
@@ -557,8 +559,8 @@ sub html_footer {
"$irt<a\nhref=\"" . ascii_html($href) . '">reply</a>' . $idx;
}
-sub linkify_ref {
- my $v = PublicInbox::Hval->new_msgid($_[0]);
+sub linkify_ref_nosrch {
+ my $v = PublicInbox::Hval->new_msgid($_[0], 1);
my $html = $v->as_html;
my $href = $v->as_href;
"<<a\nhref=\"../$href/\">$html</a>>";
@@ -699,8 +701,11 @@ sub _inline_header {
sub inline_dump {
my ($dst, $state, $upfx, $node, $level) = @_;
return unless $node;
- return if $state->{stopped};
if (my $mime = $node->message) {
+ my $mid = mid_clean($mime->header('Message-ID'));
+ if ($mid eq $state->{parent_cmp}) {
+ $state->{parent} = $mid;
+ }
_inline_header($dst, $state, $upfx, $mime, $level);
}
inline_dump($dst, $state, $upfx, $node->child, $level+1);
--
EW
^ permalink raw reply related [relevance 6%]
* [PATCH 0/7] improved thread views and 404 reductions
@ 2015-09-02 6:59 7% Eric Wong
2015-09-02 6:59 6% ` [PATCH 6/7] view: avoid links to unknown compressed Message-IDs Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2015-09-02 6:59 UTC (permalink / raw)
To: meta
The thread HTML view may now be flat (chronological, newest
first) to make active threads easier-to-follow. We also make
unknown Message-IDs more usable by avoiding running SHA-1
on them.
The Message-ID finder is also handy for cross posts
and can probably link to multiple, external sources such as
mid.gmane.org and other places.
Eric Wong (7):
view: close possible race condition in thread view
view: optional flat view for recent messages
view: account for missing In-Reply-To header
view: simplify parent anchoring code
view: pre-anchor entries for flat view
view: avoid links to unknown compressed Message-IDs
implement external Message-ID finder
lib/PublicInbox/ExtMsg.pm | 92 ++++++++++++++++++++++++
lib/PublicInbox/Hval.pm | 4 +-
lib/PublicInbox/View.pm | 180 ++++++++++++++++++++++++++++++----------------
lib/PublicInbox/WWW.pm | 18 +++--
public-inbox.cgi | 1 +
5 files changed, 226 insertions(+), 69 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-09-02 6:59 7% [PATCH 0/7] improved thread views and 404 reductions Eric Wong
2015-09-02 6:59 6% ` [PATCH 6/7] view: avoid links to unknown compressed Message-IDs Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).