From 19b69b176493ff8aa221dca116578b4d42b3ff57 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Thu, 5 Dec 2024 16:05:03 +0100 Subject: [PATCH] (site-info) Only show samples if feed is absent, never both. --- .../nu/marginalia/search/svc/SearchSiteInfoService.java | 8 ++++++++ .../resources/jte/siteinfo/view/overview.jte | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/services-application/search-service/java/nu/marginalia/search/svc/SearchSiteInfoService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchSiteInfoService.java index e3395e9b..64613640 100644 --- a/code/services-application/search-service/java/nu/marginalia/search/svc/SearchSiteInfoService.java +++ b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchSiteInfoService.java @@ -340,6 +340,14 @@ public class SearchSiteInfoService { implements SiteInfoModel { + public boolean hasSamples() { + return samples != null && !samples.isEmpty(); + } + + public boolean hasFeed() { + return feed != null && !feed.items.isEmpty(); + } + public String query() { return "site:" + domain; } public boolean isKnown() { diff --git a/code/services-application/search-service/resources/jte/siteinfo/view/overview.jte b/code/services-application/search-service/resources/jte/siteinfo/view/overview.jte index d6dab198..71970dd9 100644 --- a/code/services-application/search-service/resources/jte/siteinfo/view/overview.jte +++ b/code/services-application/search-service/resources/jte/siteinfo/view/overview.jte @@ -25,8 +25,7 @@ @endif - @if (siteInfo.feed() != null && !siteInfo.feed().items().isEmpty()) - + @if (siteInfo.hasFeed())
Feed @@ -46,7 +45,7 @@ @endif - @if (siteInfo.samples() != null && !siteInfo.samples().isEmpty()) + @if (siteInfo.hasSamples() && !siteInfo.hasFeed())