diff --git a/Account/Sources/Account/AccountManager.swift b/Account/Sources/Account/AccountManager.swift index abdf4d154..a6a996c62 100644 --- a/Account/Sources/Account/AccountManager.swift +++ b/Account/Sources/Account/AccountManager.swift @@ -18,8 +18,8 @@ import RSDatabase public final class AccountManager: UnreadCountProvider { public static var shared: AccountManager! - public static let netNewsWireNewsURL = "https://nnw.ranchero.com/feed.xml" - private static let jsonNetNewsWireNewsURL = "https://nnw.ranchero.com/feed.json" + public static let netNewsWireNewsURL = "https://netnewswire.blog/feed.xml" + private static let jsonNetNewsWireNewsURL = "https://netnewswire.blog/feed.json" public let defaultAccount: Account diff --git a/Shared/Favicons/FaviconDownloader.swift b/Shared/Favicons/FaviconDownloader.swift index da9822650..170bd453a 100644 --- a/Shared/Favicons/FaviconDownloader.swift +++ b/Shared/Favicons/FaviconDownloader.swift @@ -122,7 +122,7 @@ final class FaviconDownloader: Logging { let url = homePageURL.normalizedURL if let url = URL(string: homePageURL) { - if url.host == "nnw.ranchero.com" { + if url.host == "nnw.ranchero.com" || url.host == "netnewswire.blog" { return IconImage.appIcon } } diff --git a/Shared/Images/WebFeedIconDownloader.swift b/Shared/Images/WebFeedIconDownloader.swift index 4604a1285..6bdb648ab 100644 --- a/Shared/Images/WebFeedIconDownloader.swift +++ b/Shared/Images/WebFeedIconDownloader.swift @@ -77,7 +77,7 @@ public final class WebFeedIconDownloader { return cachedImage } - if let hpURLString = feed.homePageURL, let hpURL = URL(string: hpURLString), hpURL.host == "nnw.ranchero.com" { + if let hpURLString = feed.homePageURL, let hpURL = URL(string: hpURLString), hpURL.host == "nnw.ranchero.com" || hpURL.host == "netnewswire.blog" { return IconImage.appIcon } diff --git a/Shared/Importers/DefaultFeeds.opml b/Shared/Importers/DefaultFeeds.opml index b33778b47..64cb05c9a 100644 --- a/Shared/Importers/DefaultFeeds.opml +++ b/Shared/Importers/DefaultFeeds.opml @@ -16,7 +16,7 @@ - + diff --git a/Technotes/HelpBook/5.0/en/netnewswire-news.markdown b/Technotes/HelpBook/5.0/en/netnewswire-news.markdown index 345972de0..1246b200a 100644 --- a/Technotes/HelpBook/5.0/en/netnewswire-news.markdown +++ b/Technotes/HelpBook/5.0/en/netnewswire-news.markdown @@ -11,6 +11,6 @@ Add the NetNewsWire News Feed The NetNewsWire News Feed is part of the default subscription list installed the first time you launched NetNewsWire. If it’s no longer in your list, it’s easy to add it back. -In the menu bar, select **Help → Add NetNewsWire News Feed**. NetNewsWire will open the [New Feed dialog](adding-feeds.html) pre-filled with the name and address (`https://nnw.ranchero.com/feed.json`). Click Add. +In the menu bar, select **Help → Add NetNewsWire News Feed**. NetNewsWire will open the [New Feed dialog](adding-feeds.html) pre-filled with the name and address (`https://netnewswire.blog/feed.json`). Click Add. -Now you’ll always be up to date with what’s happening with NetNewsWire. \ No newline at end of file +Now you’ll always be up to date with what’s happening with NetNewsWire.