unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
* [PATCH 0/7] new index and misc fixes
@ 2015-09-04  2:18 Eric Wong
  2015-09-04  2:18 ` [PATCH 1/7] doc: design_www: more accessibility guidelines Eric Wong
                   ` (6 more replies)
  0 siblings, 7 replies; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:18 UTC (permalink / raw)
  To: meta

Hopefully these changes eliminate all broken links and
improve the readability of index pages

 Documentation/design_www.txt |  10 +++
 lib/PublicInbox/ExtMsg.pm    |   1 +
 lib/PublicInbox/Feed.pm      | 124 +++++++++----------------------
 lib/PublicInbox/SearchMsg.pm |  21 ++++--
 lib/PublicInbox/Thread.pm    |   7 --
 lib/PublicInbox/View.pm      | 169 ++++++++++++++++++++++++++++++++++++-------
 6 files changed, 201 insertions(+), 131 deletions(-)


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 1/7] doc: design_www: more accessibility guidelines
  2015-09-04  2:18 [PATCH 0/7] new index and misc fixes Eric Wong
@ 2015-09-04  2:18 ` Eric Wong
  2015-09-04  2:18 ` [PATCH 2/7] index: use message threading if search is available Eric Wong
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:18 UTC (permalink / raw)
  To: meta

Despite best intentions, things like strike-throughs and italics
won't render well and will harm accessibility.
---
 Documentation/design_www.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/design_www.txt b/Documentation/design_www.txt
index b73a798..8763184 100644
--- a/Documentation/design_www.txt
+++ b/Documentation/design_www.txt
@@ -59,6 +59,16 @@ variable-width fonts.
 
 * No setting colors or font sizes, power to users to decide those.
 
+* Only one font type (fixed or variable) per page.  This is for
+  accessibility, we must not blow certain elements out-of-proportion
+  when a reader increases font size.
+
+* Bold and underline elements are OK since they should render fine
+  regardless of chosen font and gracefully degrade if a display does
+  not support them.  Italics and strike-through elements must be
+  avoided as they do not render well with some displays or user-chosen
+  fonts.
+
 * No JavaScript. JS is historically too buggy and insecure, and we will
   never expect our readers to do either of the following:
   a) read and audit all our code for on every single page load
-- 
EW


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 2/7] index: use message threading if search is available
  2015-09-04  2:18 [PATCH 0/7] new index and misc fixes Eric Wong
  2015-09-04  2:18 ` [PATCH 1/7] doc: design_www: more accessibility guidelines Eric Wong
@ 2015-09-04  2:18 ` Eric Wong
  2015-09-04  2:18 ` [PATCH 3/7] consolidate thread sorting in view Eric Wong
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:18 UTC (permalink / raw)
  To: meta

This lets us merge topics with different subjects with a common parent
(common in "[PATCH 0/X]" threads).  This also lets us avoid forking for
the HTML index page, too.
---
 lib/PublicInbox/Feed.pm | 124 +++++++++++++-----------------------------------
 lib/PublicInbox/View.pm | 110 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 142 insertions(+), 92 deletions(-)

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 75fecf5..8fcb8d8 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -123,6 +123,8 @@ sub emit_html_index {
 	my $title = $feed_opts->{description} || '';
 	$title = PublicInbox::Hval->new_oneline($title)->as_html;
 	my $atom_url = $feed_opts->{atomurl};
+	my ($footer, $param, $last, $srch);
+	my $state = { ctx => $ctx, seen => {}, anchor_idx => 0 };
 
 	$fh->write("<html><head><title>$title</title>" .
 		   "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
@@ -130,61 +132,60 @@ sub emit_html_index {
 		   '</head><body>' . PublicInbox::View::PRE_WRAP .
 		   "<b>$title</b> (<a\nhref=\"$atom_url\">Atom feed</a>)\n");
 
-	my $state;
-	my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
-	my $topics;
-	my $srch = $ctx->{srch};
-	$srch and $topics = [ [], {} ];
-	my (undef, $last) = each_recent_blob($ctx, sub {
-		my ($path, $commit, $ts, $u, $subj) = @_;
-		$state ||= {
-			ctx => $ctx,
-			seen => {},
-			first_commit => $commit,
-			anchor_idx => 0,
-		};
-
-		if ($srch) {
-			add_topic($git, $srch, $topics, $path, $ts, $u, $subj);
-		} else {
-			my $mime = do_cat_mail($git, $path) or return 0;
-			PublicInbox::View::index_entry($fh, $mime, 0, $state);
-			1;
-		}
-	});
-	Email::Address->purge_cache;
-	$git = undef; # destroy pipes.
-
-	my $footer = nav_footer($ctx->{cgi}, $last, $feed_opts, $state);
+	# if the 'r' query parameter is given, it is a legacy permalink
+	# which we must continue supporting:
+	my $cgi = $ctx->{cgi};
+	if ($cgi && !$cgi->param('r') && ($srch = $ctx->{srch})) {
+		$state->{srch} = $srch;
+		$last = PublicInbox::View::emit_index_topics($state, $fh);
+		$param = 'o';
+	} else {
+		$last = emit_index_nosrch($ctx, $state, $fh);
+		$param = 'r';
+	}
+	$footer = nav_footer($cgi, $last, $feed_opts, $state, $param);
 	if ($footer) {
 		my $list_footer = $ctx->{footer};
 		$footer .= "\n\n" . $list_footer if $list_footer;
 		$footer = "<hr /><pre>$footer</pre>";
 	}
-	$fh->write(dump_topics($topics)) if $topics;
 	$fh->write("$footer</body></html>");
 	$fh->close;
 }
 
+sub emit_index_nosrch {
+	my ($ctx, $state, $fh) = @_;
+	my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
+	my (undef, $last) = each_recent_blob($ctx, sub {
+		my ($path, $commit, $ts, $u, $subj) = @_;
+		$state->{first} ||= $commit;
+
+		my $mime = do_cat_mail($git, $path) or return 0;
+		PublicInbox::View::index_entry($fh, $mime, 0, $state);
+		1;
+	});
+	Email::Address->purge_cache;
+	$last;
+}
+
 sub nav_footer {
-	my ($cgi, $last, $feed_opts, $state) = @_;
+	my ($cgi, $last, $feed_opts, $state, $param) = @_;
 	$cgi or return '';
-	my $old_r = $cgi->param('r');
+	my $old_r = $cgi->param($param);
 	my $head = '    ';
 	my $next = '    ';
-	my $first = $state->{first_commit};
+	my $first = $state->{first};
 	my $anchor = $state->{anchor_idx};
 
 	if ($last) {
-		$next = qq!<a\nhref="?r=$last">next</a>!;
+		$next = qq!<a\nhref="?$param=$last">next</a>!;
 	}
 	if ($old_r) {
 		$head = $cgi->path_info;
 		$head = qq!<a\nhref="$head">head</a>!;
 	}
 	my $atom = "<a\nhref=\"$feed_opts->{atomurl}\">atom</a>";
-	my $permalink = "<a\nhref=\"?r=$first\">permalink</a>";
-	"<a\nname=\"s$anchor\">page:</a> $next $head $atom $permalink";
+	"<a\nname=\"s$anchor\">page:</a> $next $head $atom";
 }
 
 sub each_recent_blob {
@@ -369,61 +370,4 @@ sub do_cat_mail {
 	$@ ? undef : $mime;
 }
 
-# accumulate recent topics if search is supported
-sub add_topic {
-	my ($git, $srch, $topics, $path, $ts, $u, $subj) = @_;
-	my ($order, $subjs) = @$topics;
-	my $header_obj;
-
-	# legacy ssoma did not set commit titles based on Subject
-	$subj = $enc_utf8->decode($subj);
-	if ($subj eq 'mda') {
-		my $mime = do_cat_mail($git, $path) or return 0;
-		$header_obj = $mime->header_obj;
-		$subj = mime_header($header_obj, 'Subject');
-	}
-
-	my $topic = $subj = $srch->subject_normalized($subj);
-
-	# kill "[PATCH v2]" etc. for summarization
-	$topic =~ s/\A\s*\[[^\]]+\]\s*//g;
-
-	if (++$subjs->{$topic} == 1) {
-		unless ($header_obj) {
-			my $mime = do_cat_mail($git, $path) or return 0;
-			$header_obj = $mime->header_obj;
-		}
-		my $mid = mid_clean($header_obj->header('Message-ID'));
-		$u = $enc_utf8->decode($u);
-		push @$order, [ $mid, $ts, $u, $subj, $topic ];
-		return 1;
-	}
-	0; # old topic, continue going
-}
-
-sub dump_topics {
-	my ($topics) = @_;
-	my ($order, $subjs) = @$topics;
-	my $dst = '';
-	$dst .= "\n[No recent topics]" unless (scalar @$order);
-	while (defined(my $info = shift @$order)) {
-		my ($mid, $ts, $u, $subj, $topic) = @$info;
-		my $n = delete $subjs->{$topic};
-		$mid = PublicInbox::Hval->new($mid)->as_href;
-		$subj = PublicInbox::Hval->new($subj)->as_html;
-		$u = PublicInbox::Hval->new($u)->as_html;
-		$dst .= "\n<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n- ";
-		$ts = strftime('%Y-%m-%d %H:%M', gmtime($ts));
-		if ($n == 1) {
-			$dst .= "created by $u @ $ts UTC\n"
-		} else {
-			# $n isn't the total number of posts on the topic,
-			# just the number of posts in the current "git log"
-			# window, so leave it unlabeled
-			$dst .= "updated by $u @ $ts UTC ($n)\n"
-		}
-	}
-	$dst .= '</pre>'
-}
-
 1;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 129aa89..ee5ba20 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -656,11 +656,12 @@ sub msg_timestamp {
 }
 
 sub thread_results {
-	my ($msgs) = @_;
+	my ($msgs, $nosubject) = @_;
 	require PublicInbox::Thread;
 	my $th = PublicInbox::Thread->new(@$msgs);
-	$th->thread;
 	no warnings 'once';
+	$Mail::Thread::nosubject = $nosubject;
+	$th->thread;
 	$th->order(*PublicInbox::Thread::sort_ts);
 	$th
 }
@@ -746,4 +747,109 @@ sub inline_dump {
 	inline_dump($dst, $state, $upfx, $node->next, $level);
 }
 
+sub rsort_ts {
+	sort {
+		(eval { $b->topmost->message->header('X-PI-TS') } || 0) <=>
+		(eval { $a->topmost->message->header('X-PI-TS') } || 0)
+	} @_;
+}
+
+# accumulate recent topics if search is supported
+# returns 1 if done, undef if not
+sub add_topic {
+	my ($state, $node, $level) = @_;
+	return unless $node;
+
+	if (my $x = $node->message) {
+		$x = $x->header_obj;
+		my ($topic, $subj);
+
+		$subj = $x->header('Subject');
+		$subj = $state->{srch}->subject_normalized($subj);
+		$topic = $subj;
+
+		# kill "[PATCH v2]" etc. for summarization
+		$topic =~ s/\A\s*\[[^\]]+\]\s*//g;
+		$topic = substr($topic, 0, 30);
+
+		if (++$state->{subjs}->{$topic} == 1) {
+			push @{$state->{order}}, [ $level, $subj, $topic ];
+		}
+
+		my $mid = mid_clean($x->header('Message-ID'));
+
+		my $u = $x->header('X-PI-From');
+		my $ts = $x->header('X-PI-TS');
+		$state->{latest}->{$topic} = [ $mid, $u, $ts ];
+	} # else { } # ghost ignored...
+
+	add_topic($state, $node->child, $level + 1);
+	add_topic($state, $node->next, $level);
+}
+
+sub dump_topics {
+	my ($state) = @_;
+	my $order = $state->{order};
+	my $subjs = $state->{subjs};
+	my $latest = $state->{latest};
+	return "\n[No recent topics]</pre>" unless (scalar @$order);
+	my $dst = '';
+	my $pfx;
+	my $prev = 0;
+	my $prev_attr = '';
+	while (defined(my $info = shift @$order)) {
+		my ($level, $subj, $topic) = @$info;
+		my $n = delete $subjs->{$topic};
+		my ($mid, $u, $ts) = @{delete $latest->{$topic}};
+		$mid = PublicInbox::Hval->new($mid)->as_href;
+		$subj = PublicInbox::Hval->new($subj)->as_html;
+		$u = PublicInbox::Hval->new($u)->as_html;
+		$pfx = INDENT x $level;
+		my $nl = $level == $prev ? "\n" : '';
+		my $dot = $level == 0 ? '' : '`';
+		$dst .= "$nl$pfx$dot<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n";
+
+		my $attr;
+		$ts = POSIX::strftime('%Y-%m-%d %H:%M', gmtime($ts));
+		if ($n == 1) {
+			$attr = "created by $u @ $ts UTC";
+			$n = "\n";
+		} else {
+			# $n isn't the total number of posts on the topic,
+			# just the number of posts in the current results
+			# window, so leave it unlabeled
+			$attr = "updated by $u @ $ts UTC";
+			$n = " ($n)\n";
+		}
+		if ($level == 0 || $attr ne $prev_attr) {
+			$dst .= "$pfx - ". $attr . $n;
+			$prev_attr = $attr;
+		}
+	}
+	$dst .= '</pre>';
+}
+
+sub emit_index_topics {
+	my ($state, $fh) = @_;
+	my $off = $state->{ctx}->{cgi}->param('o');
+	$off = 0 unless defined $off;
+	$state->{order} = [];
+	$state->{subjs} = {};
+	$state->{latest} = {};
+	my $max = 25;
+	my %opts = ( offset => int $off, limit => $max * 4 );
+	while (scalar @{$state->{order}} < $max) {
+		my $res = $state->{srch}->query('', \%opts);
+		my $nr = scalar @{$res->{msgs}} or last;
+
+		for (rsort_ts(thread_results(load_results($res), 1)->rootset)) {
+			add_topic($state, $_, 0);
+		}
+		$opts{offset} += $nr;
+	}
+
+	$fh->write(dump_topics($state));
+	$opts{offset};
+}
+
 1;
-- 
EW


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 3/7] consolidate thread sorting in view
  2015-09-04  2:18 [PATCH 0/7] new index and misc fixes Eric Wong
  2015-09-04  2:18 ` [PATCH 1/7] doc: design_www: more accessibility guidelines Eric Wong
  2015-09-04  2:18 ` [PATCH 2/7] index: use message threading if search is available Eric Wong
@ 2015-09-04  2:18 ` Eric Wong
  2015-09-04  2:18 ` [PATCH 4/7] extmsg: close HTML tag in response Eric Wong
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:18 UTC (permalink / raw)
  To: meta

This is a display subroutine so it should not be in our thread
monkey-patching package, but instead in the view package.

Hopefully one day in the future, Mail::Thread will be maintained
again and we'll no longer need PublicInbox::Thread at all.
---
 lib/PublicInbox/Thread.pm | 7 -------
 lib/PublicInbox/View.pm   | 9 ++++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/PublicInbox/Thread.pm b/lib/PublicInbox/Thread.pm
index a3dedf5..781ffff 100644
--- a/lib/PublicInbox/Thread.pm
+++ b/lib/PublicInbox/Thread.pm
@@ -17,13 +17,6 @@ if ($Mail::Thread::VERSION <= 2.55) {
 	eval q(sub _container_class { 'PublicInbox::Thread::Container' });
 }
 
-sub sort_ts {
-	sort {
-		(eval { $a->topmost->message->header('X-PI-TS') } || 0) <=>
-		(eval { $b->topmost->message->header('X-PI-TS') } || 0)
-	} @_;
-}
-
 package PublicInbox::Thread::Container;
 use strict;
 use warnings;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index ee5ba20..68adbd7 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -662,7 +662,7 @@ sub thread_results {
 	no warnings 'once';
 	$Mail::Thread::nosubject = $nosubject;
 	$th->thread;
-	$th->order(*PublicInbox::Thread::sort_ts);
+	$th->order(*sort_ts);
 	$th
 }
 
@@ -747,6 +747,13 @@ sub inline_dump {
 	inline_dump($dst, $state, $upfx, $node->next, $level);
 }
 
+sub sort_ts {
+	sort {
+		(eval { $a->topmost->message->header('X-PI-TS') } || 0) <=>
+		(eval { $b->topmost->message->header('X-PI-TS') } || 0)
+	} @_;
+}
+
 sub rsort_ts {
 	sort {
 		(eval { $b->topmost->message->header('X-PI-TS') } || 0) <=>
-- 
EW


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 4/7] extmsg: close HTML tag in response
  2015-09-04  2:18 [PATCH 0/7] new index and misc fixes Eric Wong
                   ` (2 preceding siblings ...)
  2015-09-04  2:18 ` [PATCH 3/7] consolidate thread sorting in view Eric Wong
@ 2015-09-04  2:18 ` Eric Wong
  2015-09-04  2:18 ` [PATCH 5/7] view: avoid attempting to find "subject dummy" Eric Wong
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:18 UTC (permalink / raw)
  To: meta

Oops, browsers normally render this fine, though.
---
 lib/PublicInbox/ExtMsg.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 0090322..7cf696d 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -101,6 +101,7 @@ sub ext_msg {
 			$s .= qq{<a\nhref="$r">$t</a>\n};
 		}
 	}
+	$s .= '</pre></body></html>';
 
 	[300, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
 }
-- 
EW


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 5/7] view: avoid attempting to find "subject dummy"
  2015-09-04  2:18 [PATCH 0/7] new index and misc fixes Eric Wong
                   ` (3 preceding siblings ...)
  2015-09-04  2:18 ` [PATCH 4/7] extmsg: close HTML tag in response Eric Wong
@ 2015-09-04  2:18 ` Eric Wong
  2015-09-04  2:18 ` [PATCH 6/7] SearchMsg: avoid encoding Message-IDs Eric Wong
  2015-09-04  2:18 ` [PATCH 7/7] view: do not generate anchors in thread views Eric Wong
  6 siblings, 0 replies; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:18 UTC (permalink / raw)
  To: meta

This is an internal Message-ID used by Mail::Thread, to group
messages with identical subjects but common parent.  Don't
attempt to redirect users to external sites when we cannot
find it.
---
 lib/PublicInbox/View.pm | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 68adbd7..65ef1e7 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -591,6 +591,17 @@ sub pre_anchor_entry {
 	$seen->{$id} = "#$id"; # save the anchor for children, later
 }
 
+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;
+	qq{[parent not found: &lt;<a\nhref="$upfx../$href/">$html</a>&gt;]};
+}
+
 sub __thread_entry {
 	my ($cb, $git, $state, $mime, $level) = @_;
 
@@ -607,15 +618,10 @@ sub __thread_entry {
 	if (my $ghost = delete $state->{ghost}) {
 		# n.b. ghost messages may only be parents, not children
 		foreach my $g (@$ghost) {
-			my $mid = PublicInbox::Hval->new_msgid($g->[0]);
-			my $pfx = INDENT x $g->[1];
-			my $href = $mid->as_href;
-			my $html = $mid->as_html;
-			$$cb->write("<table><tr><td>$pfx</td><td>" .
-					PRE_WRAP .
-					'[parent not found: &lt;' .
-					qq{<a\nhref="../../$href/">}.
-					"$html</a>&gt;]</pre></td></table>");
+			$$cb->write("<table\nsummary=ghost><tr><td>" .
+				(INDENT x $g->[1]) . "</td><td>" .
+				PRE_WRAP . ghost_parent('', $g->[0]) .
+				'</pre></td></table>');
 		}
 	}
 	index_entry($$cb, $mime, $level, $state);
@@ -736,12 +742,7 @@ sub inline_dump {
 		_inline_header($dst, $state, $upfx, $mime, $level);
 	} else {
 		my $pfx = INDENT x $level;
-		my $v = PublicInbox::Hval->new_msgid($node->messageid, 1);
-		my $html = $v->as_html;
-		my $href = $v->as_href;
-		$$dst .= $pfx . '` [parent not found: &lt;' .
-				qq{<a\nhref="$upfx../$href/">}.
-				"$html</a>&gt;]\n";
+		$$dst .= $pfx . '` ' . ghost_parent($upfx, $node->messageid);
 	}
 	inline_dump($dst, $state, $upfx, $node->child, $level+1);
 	inline_dump($dst, $state, $upfx, $node->next, $level);
-- 
EW


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 6/7] SearchMsg: avoid encoding Message-IDs
  2015-09-04  2:18 [PATCH 0/7] new index and misc fixes Eric Wong
                   ` (4 preceding siblings ...)
  2015-09-04  2:18 ` [PATCH 5/7] view: avoid attempting to find "subject dummy" Eric Wong
@ 2015-09-04  2:18 ` Eric Wong
  2015-09-04  2:37   ` Eric Wong
  2015-09-04  2:18 ` [PATCH 7/7] view: do not generate anchors in thread views Eric Wong
  6 siblings, 1 reply; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:18 UTC (permalink / raw)
  To: meta

Spaces may be added when using header_str with Email::MIME->create,
so use the normal "header" parameter when setting Message-IDs
and References.
---
 lib/PublicInbox/SearchMsg.pm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 3891823..25b7072 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -127,22 +127,27 @@ sub ensure_metadata {
 sub mini_mime {
 	my ($self) = @_;
 	$self->ensure_metadata;
-	my @h = (
-		Subject => $self->subject,
+	my @hs = (
+		'Subject' => $self->subject,
 		'X-PI-From' => $self->from_name,
-		'X-PI-TS' => $self->ts,
-		'Message-ID' => "<$self->{mid}>",
+	);
 
+	my @h = (
 		# prevent Email::Simple::Creator from running,
 		# this header is useless for threading as we use X-PI-TS
 		# for sorting and display:
 		'Date' => EPOCH_822,
+		'Message-ID' => "<$self->{mid}>",
+		'X-PI-TS' => $self->ts,
 	);
-
-	my $refs = $self->{references_sorted};
-	my $mime = Email::MIME->create(header_str => \@h);
+	if (my $refs = $self->{references_sorted}) {
+		push @h, [ References => $refs ];
+	}
+	my $mime = Email::MIME->create(header_str => \@hs, header => \@h);
 	my $h = $mime->header_obj;
-	$h->header_set('References', $refs) if (defined $refs);
+
+	# set these headers manually since Encode::encode('MIME-Q', ...)
+	# will add spaces to long values when using header_str above.
 
 	# drop useless headers Email::MIME set for us
 	$h->header_set('Date');
-- 
EW


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH 7/7] view: do not generate anchors in thread views
  2015-09-04  2:18 [PATCH 0/7] new index and misc fixes Eric Wong
                   ` (5 preceding siblings ...)
  2015-09-04  2:18 ` [PATCH 6/7] SearchMsg: avoid encoding Message-IDs Eric Wong
@ 2015-09-04  2:18 ` Eric Wong
  6 siblings, 0 replies; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:18 UTC (permalink / raw)
  To: meta

They're unused, and they can have namespace conflicts if
there's multiple full messages in the thread view.
---
 lib/PublicInbox/View.pm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 65ef1e7..bd174b1 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -256,7 +256,7 @@ sub multipart_text_as_html {
 	# scan through all parts, looking for displayable text
 	$mime->walk_parts(sub {
 		my ($part) = @_;
-		$rv .= add_text_body($enc, $part, \$part_nr, $full_pfx);
+		$rv .= add_text_body($enc, $part, \$part_nr, $full_pfx, 1);
 	});
 	$mime->body_set('');
 	$rv;
@@ -308,7 +308,7 @@ sub linkify_2 {
 }
 
 sub flush_quote {
-	my ($quot, $n, $part_nr, $full_pfx, $final) = @_;
+	my ($quot, $n, $part_nr, $full_pfx, $final, $do_anchor) = @_;
 
 	if ($full_pfx) {
 		if (!$final && scalar(@$quot) <= MAX_INLINE_QUOTED) {
@@ -342,18 +342,18 @@ sub flush_quote {
 	} else {
 		# show everything in the full version with anchor from
 		# short version (see above)
-		my $nr = ++$$n;
-		my $rv = "";
 		my %l;
-		$rv .= join('', map { linkify_1(\%l, $_) } @$quot);
+		my $rv .= join('', map { linkify_1(\%l, $_) } @$quot);
 		@$quot = ();
 		$rv = ascii_html($rv);
+		return linkify_2(\%l, $rv) unless $do_anchor;
+		my $nr = ++$$n;
 		"<a\nid=q${part_nr}_$nr></a>" . linkify_2(\%l, $rv);
 	}
 }
 
 sub add_text_body {
-	my ($enc_msg, $part, $part_nr, $full_pfx) = @_;
+	my ($enc_msg, $part, $part_nr, $full_pfx, $do_anchor) = @_;
 	return '' if $part->subparts;
 
 	my $ct = $part->content_type;
@@ -383,7 +383,7 @@ sub add_text_body {
 			# show the previously buffered quote inline
 			if (scalar @quot) {
 				$s .= flush_quote(\@quot, \$n, $$part_nr,
-						  $full_pfx, 0);
+						  $full_pfx, 0, $do_anchor);
 			}
 
 			# regular line, OK
@@ -395,7 +395,10 @@ sub add_text_body {
 			push @quot, $cur;
 		}
 	}
-	$s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1) if scalar @quot;
+	if (scalar @quot) {
+		$s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1,
+				  $do_anchor);
+	}
 	$s .= "\n" unless $s =~ /\n\z/s;
 	++$$part_nr;
 	$s;
-- 
EW


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH 6/7] SearchMsg: avoid encoding Message-IDs
  2015-09-04  2:18 ` [PATCH 6/7] SearchMsg: avoid encoding Message-IDs Eric Wong
@ 2015-09-04  2:37   ` Eric Wong
  0 siblings, 0 replies; 9+ messages in thread
From: Eric Wong @ 2015-09-04  2:37 UTC (permalink / raw)
  To: meta

Eric Wong <e@80x24.org> wrote:
> -	my $refs = $self->{references_sorted};
> -	my $mime = Email::MIME->create(header_str => \@h);
> +	if (my $refs = $self->{references_sorted}) {
> +		push @h, [ References => $refs ];

And my Perl syntax knowledge is weak:

--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -141,7 +141,7 @@ sub mini_mime {
 		'X-PI-TS' => $self->ts,
 	);
 	if (my $refs = $self->{references_sorted}) {
-		push @h, [ References => $refs ];
+		push @h, References => $refs;
 	}
 	my $mime = Email::MIME->create(header_str => \@hs, header => \@h);
 	my $h = $mime->header_obj;

Will squash.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-09-04  2:37 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-04  2:18 [PATCH 0/7] new index and misc fixes Eric Wong
2015-09-04  2:18 ` [PATCH 1/7] doc: design_www: more accessibility guidelines Eric Wong
2015-09-04  2:18 ` [PATCH 2/7] index: use message threading if search is available Eric Wong
2015-09-04  2:18 ` [PATCH 3/7] consolidate thread sorting in view Eric Wong
2015-09-04  2:18 ` [PATCH 4/7] extmsg: close HTML tag in response Eric Wong
2015-09-04  2:18 ` [PATCH 5/7] view: avoid attempting to find "subject dummy" Eric Wong
2015-09-04  2:18 ` [PATCH 6/7] SearchMsg: avoid encoding Message-IDs Eric Wong
2015-09-04  2:37   ` Eric Wong
2015-09-04  2:18 ` [PATCH 7/7] view: do not generate anchors in thread views Eric Wong

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).