From f5e2daa70e0a1a75d1220d84193f3eeebb799c38 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 10 Sep 2022 20:10:23 +0000
Subject: [PATCH] view: fix solver links with multiple messages

For redundant messages sharing Message-IDs, the link to solver
(/$INBOX/$OID/s/) was going up too many levels for /$INBOX/$MSGID/
when there were multiple messages sharing the same $MSGID.

Unfortunately, redundant messages are common with /all/
due to signature trailers.  So dynamically assigning {-spfx}
is tricky and error prone from counting `/'.

So simplify the code a bit by setting {-spfx} once per HTTP
request, instead of every single message.
---
 lib/PublicInbox/Feed.pm          |  1 +
 lib/PublicInbox/View.pm          | 20 ++------------------
 lib/PublicInbox/WwwAtomStream.pm |  1 +
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index affe0fb6..de1e7dfe 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -70,6 +70,7 @@ sub new_html {
 	}
 	$ctx->{-html_tip} = '<pre>';
 	$ctx->{-upfx} = '';
+	$ctx->{-spfx} = '' if $ctx->{ibx}->{coderepo};
 	$ctx->{-hr} = 1;
 	PublicInbox::WwwStream::aresponse($ctx, \&new_html_i);
 }
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 0753c06e..01c086bf 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -80,6 +80,7 @@ sub msg_page {
 	# allow user to easily browse the range around this message if
 	# they have ->over
 	$ctx->{-t_max} = $smsg->{ts};
+	$ctx->{-spfx} = '../' if $ibx->{coderepo};
 	PublicInbox::WwwStream::aresponse($ctx, \&msg_page_i);
 }
 
@@ -441,6 +442,7 @@ sub thread_html {
 	my $ibx = $ctx->{ibx};
 	my ($nr, $msgs) = $ibx->over->get_thread($mid);
 	return missing_thread($ctx) if $nr == 0;
+	$ctx->{-spfx} = '../../' if $ibx->{coderepo};
 
 	# link $INBOX_DIR/description text to "index_topics" view around
 	# the newest message in this thread
@@ -584,24 +586,6 @@ sub add_text_body { # callback for each_part
 		$ctx->{-anchors} = {} if $s =~ /^diff --git /sm;
 		$diff = 1;
 		delete $ctx->{-long_path};
-		my $spfx;
-		# absolute URL (Atom feeds)
-		if ($ibx->{coderepo}) {
-			if (index($upfx, '//') >= 0) {
-				$spfx = $upfx;
-				$spfx =~ s!/([^/]*)/\z!/!;
-			} else {
-				my $n_slash = $upfx =~ tr!/!/!;
-				if ($n_slash == 0) {
-					$spfx = '../';
-				} elsif ($n_slash == 1) {
-					$spfx = '';
-				} else { # nslash == 2
-					$spfx = '../../';
-				}
-			}
-		}
-		$ctx->{-spfx} = $spfx;
 	};
 
 	# split off quoted and unquoted blocks:
diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index 33da3244..83a8818e 100644
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -16,6 +16,7 @@ use PublicInbox::MsgTime qw(msg_timestamp);
 sub new {
 	my ($class, $ctx, $cb) = @_;
 	$ctx->{feed_base_url} = $ctx->{ibx}->base_url($ctx->{env});
+	$ctx->{-spfx} = $ctx->{feed_base_url} if $ctx->{ibx}->{coderepo};
 	$ctx->{cb} = $cb || \&PublicInbox::GzipFilter::close;
 	$ctx->{emit_header} = 1;
 	bless $ctx, $class;
-- 
2.44.0