From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id E059A1F61A for ; Wed, 14 Dec 2022 22:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1671057255; bh=rF8F3BTs9lU+1S63PLm3mNaiERLGeLY5OWX6v5Vqh1w=; h=From:To:Subject:Date:From; b=b2T0VkcKWkY4Etgni9dqq72MEvzEYC2Q2grSBGWrX1dBve8aMfKDag1v06/MXk1we vdSP4QPQgw223EW+SE45cST5UieSi5jhZEEMYsbw1lP1IDHv9HyXWr0u+p6m+/ifIE 51gPDVoaDa5nA6IMs00SHekQha3WyzNkAaQI4YQ0= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] www_listing: drop "sort options + mbox downloads" bit Date: Wed, 14 Dec 2022 22:34:15 +0000 Message-Id: <20221214223415.23007-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: The sort options and mbox downloads only apply to individual inbox search endpoints, and they make no sense for the listing of inboxes themselves. --- lib/PublicInbox/SearchView.pm | 13 +++++++------ lib/PublicInbox/WwwListing.pm | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 8932c73d..aeee2a2a 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -134,7 +134,7 @@ sub mset_summary { $q->{-min_pct} = $min; $q->{-max_pct} = $max; } - $$res .= search_nav_bot($mset, $q); + $$res .= search_nav_bot($ctx, $mset, $q); undef; } @@ -225,7 +225,7 @@ EOM } sub search_nav_bot { # also used by WwwListing for searching extindex miscidx - my ($mset, $q) = @_; + my ($ctx, $mset, $q) = @_; my $total = $mset->get_matches_estimated; my $l = $q->{l}; my $rv = '
';
@@ -274,9 +274,10 @@ sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
 	$rv .= qq{prev $pd} if $prev;
 
 	my $rev = $q->qs_html(o => $o < 0 ? 0 : -1);
-	$rv .= qq{ | reverse} .
-		q{ | sort options + mbox downloads } .
-		q{above
}; + $rv .= qq{ | reverse}; + exists($ctx->{ibx}) and + $rv .= q{ | sort options + mbox downloads above}; + $rv; } sub sort_relevance { @@ -301,7 +302,7 @@ sub mset_thread { my $rootset = PublicInbox::SearchThread::thread($msgs, $r ? \&sort_relevance : \&PublicInbox::View::sort_ds, $ctx); - my $skel = search_nav_bot($mset, $q). + my $skel = search_nav_bot($ctx, $mset, $q). "
-- links below jump to the message on this page --\n";
 
 	$ctx->{-upfx} = '';
diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 72c940dd..21e5b8bc 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -162,7 +162,7 @@ sub mset_footer ($$) {
 	# no footer if too few matches
 	return '' if $mset->get_matches_estimated == $mset->size;
 	require PublicInbox::SearchView;
-	PublicInbox::SearchView::search_nav_bot($mset, $ctx->{-sq});
+	PublicInbox::SearchView::search_nav_bot($ctx, $mset, $ctx->{-sq});
 }
 
 sub mset_nav_top {