From 21ee96609afa451ae411753f6b6a32ee97435f08 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 18 Jun 2023 15:43:47 -0700
Subject: [PATCH] Update NetNewsWire feed URL to use netnewswire.blog host.

---
 Account/Sources/Account/AccountManager.swift        | 4 ++--
 Shared/Favicons/FaviconDownloader.swift             | 2 +-
 Shared/Images/WebFeedIconDownloader.swift           | 2 +-
 Shared/Importers/DefaultFeeds.opml                  | 2 +-
 Technotes/HelpBook/5.0/en/netnewswire-news.markdown | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Account/Sources/Account/AccountManager.swift b/Account/Sources/Account/AccountManager.swift
index ad588f955..8fbd56250 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 bda684e43..3f8b85d30 100644
--- a/Shared/Favicons/FaviconDownloader.swift
+++ b/Shared/Favicons/FaviconDownloader.swift
@@ -121,7 +121,7 @@ final class FaviconDownloader {
 		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..30027baef 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 684697f54..18d9be502 100644
--- a/Shared/Importers/DefaultFeeds.opml
+++ b/Shared/Importers/DefaultFeeds.opml
@@ -15,7 +15,7 @@
 	  <outline text="Manton Reece" title="Manton Reece" type="rss" version="RSS" htmlUrl="https://manton.org/" xmlUrl="https://www.manton.org/feed/json"/>
 	  <outline text="Maurice Parker" title="Maurice Parker" type="rss" version="RSS" htmlUrl="https://vincode.io/" xmlUrl="https://vincode.io/feed.xml"/>
 	  <outline text="Michael Tsai" title="Michael Tsai" type="rss" version="RSS" htmlUrl="https://mjtsai.com/blog/" xmlUrl="https://mjtsai.com/blog/feed/"/>
-	  <outline text="NetNewsWire Blog" title="NetNewsWire Blog" type="rss" version="RSS" htmlUrl="https://nnw.ranchero.com/" xmlUrl="https://nnw.ranchero.com/feed.json"/>
+	  <outline text="NetNewsWire Blog" title="NetNewsWire Blog" type="rss" version="RSS" htmlUrl="https://netnewswire.blog/" xmlUrl="https://netnewswire.blog/feed.json"/>
 	  <outline text="One Foot Tsunami" title="One Foot Tsunami" type="rss" version="RSS" htmlUrl="https://onefoottsunami.com/" xmlUrl="https://onefoottsunami.com/feed/json/"/>
 	  <outline text="Six Colors" title="Six Colors" type="rss" version="RSS" htmlUrl="https://sixcolors.com/" xmlUrl="https://feedpress.me/sixcolors?type=xml"/>
   </body>
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.