From 97e1ca1992467401370c8a78906ae8f3aaf4c081 Mon Sep 17 00:00:00 2001 From: Alex Grebenyuk Date: Thu, 27 Nov 2025 16:14:32 -0500 Subject: [PATCH] Add fallback for subscription title for JN sites --- Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift | 9 +++++++++ .../Sidebar/ReaderSidebarSubscriptionsSection.swift | 2 +- .../Reader/Subscriptions/ReaderSubscriptionCell.swift | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift b/Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift index 467f8fa7d2e6..779ce6f52a3b 100644 --- a/Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift +++ b/Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift @@ -3,6 +3,15 @@ import Foundation public extension ReaderSiteTopic { + /// The preferred display title for the site. + /// Returns the site title if not empty, otherwise returns the site host, or "–" if unavailable. + var preferredDisplayTitle: String { + if !title.isEmpty { + return title + } + return URL(string: siteURL)?.host ?? "–" + } + /// Find a site topic by its site id /// /// - Parameter siteID: The site id of the topic diff --git a/WordPress/Classes/ViewRelated/Reader/Sidebar/ReaderSidebarSubscriptionsSection.swift b/WordPress/Classes/ViewRelated/Reader/Sidebar/ReaderSidebarSubscriptionsSection.swift index 7ba59213aa13..89cf0ba1a46d 100644 --- a/WordPress/Classes/ViewRelated/Reader/Sidebar/ReaderSidebarSubscriptionsSection.swift +++ b/WordPress/Classes/ViewRelated/Reader/Sidebar/ReaderSidebarSubscriptionsSection.swift @@ -36,7 +36,7 @@ struct ReaderSidebarSubscriptionCell: View { var body: some View { HStack { Label { - Text(site.title) + Text(site.preferredDisplayTitle) } icon: { ReaderSiteIconView(site: site, size: .small) } diff --git a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift index 04f64b8f197e..1d5ad8ff91aa 100644 --- a/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift +++ b/WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift @@ -27,7 +27,7 @@ struct ReaderSubscriptionCell: View { VStack(alignment: .leading, spacing: 3) { HStack(alignment: .firstTextBaseline, spacing: 8) { - Text(site.title) + Text(site.preferredDisplayTitle) .font(.body.weight(.medium)) } Text(details)