Continue renaming webFeed to feed.

2025-08-12 06:26:36 +00:00 · 2024-11-02 11:08:58 -07:00
parent 2d3ef95619
commit 4fa4c6a541
95 changed files with 1156 additions and 1160 deletions
--- a/iOS/Add/AddFeedViewController.swift
+++ b/iOS/Add/AddFeedViewController.swift
@@ -147,7 +147,7 @@ class AddFeedViewController: UITableViewController {
 	
 	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 		if indexPath.row == 2 {
-			let navController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedFolderNavViewController") as! UINavigationController
+			let navController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFeedFolderNavViewController") as! UINavigationController
 			navController.modalPresentationStyle = .currentContext
 			let folderViewController = navController.topViewController as! AddFeedFolderViewController
 			folderViewController.delegate = self
@@ -159,7 +159,7 @@ class AddFeedViewController: UITableViewController {
 	
 }

-// MARK: AddWebFeedFolderViewControllerDelegate
+// MARK: AddFeedFolderViewControllerDelegate

 extension AddFeedViewController: AddFeedFolderViewControllerDelegate {
 	func didSelect(container: Container) {
--- a/iOS/Article/WebViewController.swift
+++ b/iOS/Article/WebViewController.swift
@@ -68,7 +68,7 @@ class WebViewController: UIViewController {
 	override func viewDidLoad() {
 		super.viewDidLoad()

-		NotificationCenter.default.addObserver(self, selector: #selector(webFeedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
+		NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(avatarDidBecomeAvailable(_:)), name: .AvatarDidBecomeAvailable, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(faviconDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(currentArticleThemeDidChangeNotification(_:)), name: .CurrentArticleThemeDidChangeNotification, object: nil)
@@ -83,7 +83,7 @@ class WebViewController: UIViewController {
 	
 	// MARK: Notifications
 	
-	@objc func webFeedIconDidBecomeAvailable(_ note: Notification) {
+	@objc func feedIconDidBecomeAvailable(_ note: Notification) {
 		reloadArticleImage()
 	}

@@ -451,8 +451,8 @@ extension WebViewController: WKScriptMessageHandler {
 		case MessageName.imageWasClicked:
 			imageWasClicked(body: message.body as? String)
 		case MessageName.showFeedInspector:
-			if let webFeed = article?.feed {
-				coordinator.showFeedInspector(for: webFeed)
+			if let feed = article?.feed {
+				coordinator.showFeedInspector(for: feed)
 			}
 		default:
 			return
--- a/iOS/Inspector/WebFeedInspectorViewController.swift
+++ b/iOS/Inspector/WebFeedInspectorViewController.swift
@@ -1,5 +1,5 @@
 //
-//  WebFeedInspectorViewController.swift
+//  FeedInspectorViewController.swift
 //  NetNewsWire-iOS
 //
 //  Created by Maurice Parker on 11/6/19.
@@ -11,11 +11,11 @@ import Account
 import SafariServices
 import UserNotifications

-class WebFeedInspectorViewController: UITableViewController {
+class FeedInspectorViewController: UITableViewController {
 	
 	static let preferredContentSizeForFormSheetDisplay = CGSize(width: 460.0, height: 500.0)
 	
-	var webFeed: Feed!
+	var feed: Feed!
 	@IBOutlet weak var nameTextField: UITextField!
 	@IBOutlet weak var notifyAboutNewArticlesSwitch: UISwitch!
 	@IBOutlet weak var alwaysShowReaderViewSwitch: UISwitch!
@@ -24,13 +24,13 @@ class WebFeedInspectorViewController: UITableViewController {
 	
 	private var headerView: InspectorIconHeaderView?
 	private var iconImage: IconImage? {
-		return IconImageCache.shared.imageForFeed(webFeed)
+		return IconImageCache.shared.imageForFeed(feed)
 	}
 	
 	private let homePageIndexPath = IndexPath(row: 0, section: 1)
 	
 	private var shouldHideHomePageSection: Bool {
-		return webFeed.homePageURL == nil
+		return feed.homePageURL == nil
 	}
 	
 	private var userNotificationSettings: UNNotificationSettings?
@@ -38,18 +38,18 @@ class WebFeedInspectorViewController: UITableViewController {
 	override func viewDidLoad() {
 		tableView.register(InspectorIconHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
 		
-		navigationItem.title = webFeed.nameForDisplay
-		nameTextField.text = webFeed.nameForDisplay
+		navigationItem.title = feed.nameForDisplay
+		nameTextField.text = feed.nameForDisplay
 		
-		notifyAboutNewArticlesSwitch.setOn(webFeed.isNotifyAboutNewArticles ?? false, animated: false)
+		notifyAboutNewArticlesSwitch.setOn(feed.isNotifyAboutNewArticles ?? false, animated: false)
 		
-		alwaysShowReaderViewSwitch.setOn(webFeed.isArticleExtractorAlwaysOn ?? false, animated: false)
+		alwaysShowReaderViewSwitch.setOn(feed.isArticleExtractorAlwaysOn ?? false, animated: false)

-		homePageLabel.text = webFeed.homePageURL?.decodedURLString
-		feedURLLabel.text = webFeed.url.decodedURLString
-		
-		NotificationCenter.default.addObserver(self, selector: #selector(webFeedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
+		homePageLabel.text = feed.homePageURL?.decodedURLString
+		feedURLLabel.text = feed.url.decodedURLString
 		
+		NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
+
 		NotificationCenter.default.addObserver(self, selector: #selector(updateNotificationSettings), name: UIApplication.willEnterForegroundNotification, object: nil)
 		
 	}
@@ -59,15 +59,15 @@ class WebFeedInspectorViewController: UITableViewController {
 	}
 	
 	override func viewDidDisappear(_ animated: Bool) {
-		if nameTextField.text != webFeed.nameForDisplay {
+		if nameTextField.text != feed.nameForDisplay {
 			let nameText = nameTextField.text ?? ""
-			let newName = nameText.isEmpty ? (webFeed.name ?? NSLocalizedString("Untitled", comment: "Feed name")) : nameText
-			webFeed.rename(to: newName) { _ in }
+			let newName = nameText.isEmpty ? (feed.name ?? NSLocalizedString("Untitled", comment: "Feed name")) : nameText
+			feed.rename(to: newName) { _ in }
 		}
 	}
 	
 	// MARK: Notifications
-	@objc func webFeedIconDidBecomeAvailable(_ notification: Notification) {
+	@objc func feedIconDidBecomeAvailable(_ notification: Notification) {
 		headerView?.iconView.iconImage = iconImage
 	}
 	
@@ -80,13 +80,13 @@ class WebFeedInspectorViewController: UITableViewController {
 			notifyAboutNewArticlesSwitch.isOn = !notifyAboutNewArticlesSwitch.isOn
 			present(notificationUpdateErrorAlert(), animated: true, completion: nil)
 		} else if settings.authorizationStatus == .authorized {
-			webFeed.isNotifyAboutNewArticles = notifyAboutNewArticlesSwitch.isOn
+			feed.isNotifyAboutNewArticles = notifyAboutNewArticlesSwitch.isOn
 		} else {
 			UNUserNotificationCenter.current().requestAuthorization(options:[.badge, .sound, .alert]) { (granted, error) in
 				self.updateNotificationSettings()
 				if granted {
 					DispatchQueue.main.async {
-						self.webFeed.isNotifyAboutNewArticles = self.notifyAboutNewArticlesSwitch.isOn
+						self.feed.isNotifyAboutNewArticles = self.notifyAboutNewArticlesSwitch.isOn
 						UIApplication.shared.registerForRemoteNotifications()
 					}
 				} else {
@@ -99,7 +99,7 @@ class WebFeedInspectorViewController: UITableViewController {
 	}
 	
 	@IBAction func alwaysShowReaderViewChanged(_ sender: Any) {
-		webFeed.isArticleExtractorAlwaysOn = alwaysShowReaderViewSwitch.isOn
+		feed.isArticleExtractorAlwaysOn = alwaysShowReaderViewSwitch.isOn
 	}
 	
 	@IBAction func done(_ sender: Any) {
@@ -128,7 +128,7 @@ class WebFeedInspectorViewController: UITableViewController {

 // MARK: Table View

-extension WebFeedInspectorViewController {
+extension FeedInspectorViewController {

 	override func numberOfSections(in tableView: UITableView) -> Int {
 		let numberOfSections = super.numberOfSections(in: tableView)
@@ -150,7 +150,7 @@ extension WebFeedInspectorViewController {
 				return cell
 			}
 			label.numberOfLines = 2
-			label.text = webFeed.notificationDisplayName.capitalized
+			label.text = feed.notificationDisplayName.capitalized
 		}
 		return cell
 	}
@@ -171,7 +171,7 @@ extension WebFeedInspectorViewController {
 	
 	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 		if shift(indexPath) == homePageIndexPath,
-			let homePageUrlString = webFeed.homePageURL,
+			let homePageUrlString = feed.homePageURL,
 			let homePageUrl = URL(string: homePageUrlString) {
 			
 			let safari = SFSafariViewController(url: homePageUrl)
@@ -186,7 +186,7 @@ extension WebFeedInspectorViewController {

 // MARK: UITextFieldDelegate

-extension WebFeedInspectorViewController: UITextFieldDelegate {
+extension FeedInspectorViewController: UITextFieldDelegate {
 	
 	func textFieldShouldReturn(_ textField: UITextField) -> Bool {
 		textField.resignFirstResponder()
@@ -197,7 +197,7 @@ extension WebFeedInspectorViewController: UITextFieldDelegate {

 // MARK: UNUserNotificationCenter

-extension WebFeedInspectorViewController {
+extension FeedInspectorViewController {
 	
 	@objc
 	func updateNotificationSettings() {
--- a/iOS/MasterFeed/MasterFeedViewController+Drag.swift
+++ b/iOS/MasterFeed/MasterFeedViewController+Drag.swift
@@ -13,11 +13,11 @@ import Account
 extension MasterFeedViewController: UITableViewDragDelegate {
 	
 	func tableView(_ tableView: UITableView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
-		guard let node = coordinator.nodeFor(indexPath), let webFeed = node.representedObject as? Feed else {
+		guard let node = coordinator.nodeFor(indexPath), let feed = node.representedObject as? Feed else {
 			return [UIDragItem]()
 		}
 		
-		let data = webFeed.url.data(using: .utf8)
+		let data = feed.url.data(using: .utf8)
 		let itemProvider = NSItemProvider()
 		  
 		itemProvider.registerDataRepresentation(forTypeIdentifier: kUTTypeURL as String, visibility: .ownProcess) { completion in
--- a/iOS/MasterFeed/MasterFeedViewController+Drop.swift
+++ b/iOS/MasterFeed/MasterFeedViewController+Drop.swift
@@ -31,8 +31,8 @@ extension MasterFeedViewController: UITableViewDropDelegate {
 		// Validate account specific behaviors...
 		if destAccount.behaviors.contains(.disallowFeedInMultipleFolders),
 		   let sourceNode = session.localDragSession?.items.first?.localObject as? Node,
-		   let sourceWebFeed = sourceNode.representedObject as? Feed,
-		   sourceWebFeed.account?.accountID != destAccount.accountID && destAccount.hasFeed(withURL: sourceWebFeed.url) {
+		   let sourceFeed = sourceNode.representedObject as? Feed,
+		   sourceFeed.account?.accountID != destAccount.accountID && destAccount.hasFeed(withURL: sourceFeed.url) {
 			return UITableViewDropProposal(operation: .forbidden)
 		}

@@ -91,16 +91,16 @@ extension MasterFeedViewController: UITableViewDropDelegate {
 			}
 		}()
 		
-		guard let destination = destinationContainer, let webFeed = dragNode.representedObject as? Feed else { return }
+		guard let destination = destinationContainer, let feed = dragNode.representedObject as? Feed else { return }
 		
 		if source.account == destination.account {
-			moveWebFeedInAccount(feed: webFeed, sourceContainer: source, destinationContainer: destination)
+			moveFeedInAccount(feed: feed, sourceContainer: source, destinationContainer: destination)
 		} else {
-			moveWebFeedBetweenAccounts(feed: webFeed, sourceContainer: source, destinationContainer: destination)
+			moveFeedBetweenAccounts(feed: feed, sourceContainer: source, destinationContainer: destination)
 		}
 	}

-	func moveWebFeedInAccount(feed: Feed, sourceContainer: Container, destinationContainer: Container) {
+	func moveFeedInAccount(feed: Feed, sourceContainer: Container, destinationContainer: Container) {
 		guard sourceContainer !== destinationContainer else { return }
 		
 		BatchUpdate.shared.start()
@@ -115,7 +115,7 @@ extension MasterFeedViewController: UITableViewDropDelegate {
 		}
 	}
 	
-	func moveWebFeedBetweenAccounts(feed: Feed, sourceContainer: Container, destinationContainer: Container) {
+	func moveFeedBetweenAccounts(feed: Feed, sourceContainer: Container, destinationContainer: Container) {
 		
 		if let existingFeed = destinationContainer.account?.existingFeed(withURL: feed.url) {
 			
@@ -123,7 +123,7 @@ extension MasterFeedViewController: UITableViewDropDelegate {
 			destinationContainer.account?.addFeed(existingFeed, to: destinationContainer) { result in
 				switch result {
 				case .success:
-					sourceContainer.account?.removeWebFeed(feed, from: sourceContainer) { result in
+					sourceContainer.account?.removeFeed(feed, from: sourceContainer) { result in
 						BatchUpdate.shared.end()
 						switch result {
 						case .success:
@@ -144,7 +144,7 @@ extension MasterFeedViewController: UITableViewDropDelegate {
 			destinationContainer.account?.createFeed(url: feed.url, name: feed.editedName, container: destinationContainer, validateFeed: false) { result in
 				switch result {
 				case .success:
-					sourceContainer.account?.removeWebFeed(feed, from: sourceContainer) { result in
+					sourceContainer.account?.removeFeed(feed, from: sourceContainer) { result in
 						BatchUpdate.shared.end()
 						switch result {
 						case .success:
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/MasterFeed/MasterFeedViewController.swift
@@ -68,8 +68,8 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {

 		NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(faviconDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil)
-		NotificationCenter.default.addObserver(self, selector: #selector(webFeedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
-		NotificationCenter.default.addObserver(self, selector: #selector(webFeedSettingDidChange(_:)), name: .FeedSettingDidChange, object: nil)
+		NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
+		NotificationCenter.default.addObserver(self, selector: #selector(feedSettingDidChange(_:)), name: .FeedSettingDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(willEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)		

@@ -129,19 +129,19 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		applyToAvailableCells(configureIcon)
 	}

-	@objc func webFeedIconDidBecomeAvailable(_ note: Notification) {
-		guard let webFeed = note.userInfo?[UserInfoKey.feed] as? Feed else {
+	@objc func feedIconDidBecomeAvailable(_ note: Notification) {
+		guard let feed = note.userInfo?[UserInfoKey.feed] as? Feed else {
 			return
 		}
-		applyToCellsForRepresentedObject(webFeed, configureIcon(_:_:))
+		applyToCellsForRepresentedObject(feed, configureIcon(_:_:))
 	}

-	@objc func webFeedSettingDidChange(_ note: Notification) {
-		guard let webFeed = note.object as? Feed, let key = note.userInfo?[Feed.FeedSettingUserInfoKey] as? String else {
+	@objc func feedSettingDidChange(_ note: Notification) {
+		guard let feed = note.object as? Feed, let key = note.userInfo?[Feed.FeedSettingUserInfoKey] as? String else {
 			return
 		}
 		if key == Feed.FeedSettingKey.homePageURL || key == Feed.FeedSettingKey.faviconURL {
-			configureCellsForRepresentedObject(webFeed)
+			configureCellsForRepresentedObject(feed)
 		}
 	}
 	
@@ -268,13 +268,13 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		renameAction.backgroundColor = UIColor.systemOrange
 		actions.append(renameAction)
 		
-		if let webFeed = coordinator.nodeFor(indexPath)?.representedObject as? Feed {
+		if let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed {
 			let moreTitle = NSLocalizedString("More", comment: "More")
 			let moreAction = UIContextualAction(style: .normal, title: moreTitle) { [weak self] (action, view, completion) in
 				
 				if let self = self {
 				
-					let alert = UIAlertController(title: webFeed.nameForDisplay, message: nil, preferredStyle: .actionSheet)
+					let alert = UIAlertController(title: feed.nameForDisplay, message: nil, preferredStyle: .actionSheet)
 					if let popoverController = alert.popoverPresentationController {
 						popoverController.sourceView = view
 						popoverController.sourceRect = CGRect(x: view.frame.size.width/2, y: view.frame.size.height/2, width: 1, height: 1)
@@ -324,7 +324,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 			return nil
 		}
 		if feed is Feed {
-			return makeWebFeedContextMenu(indexPath: indexPath, includeDeleteRename: true)
+			return makeFeedContextMenu(indexPath: indexPath, includeDeleteRename: true)
 		} else if feed is Folder {
 			return makeFolderContextMenu(indexPath: indexPath)
 		} else if feed is PseudoFeed  {
@@ -439,9 +439,9 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 			let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel")
 			let cancelAction = UIAlertAction(title: cancelTitle, style: .cancel)
 			
-			let addWebFeedActionTitle = NSLocalizedString("Add Web Feed", comment: "Add Web Feed")
-			let addWebFeedAction = UIAlertAction(title: addWebFeedActionTitle, style: .default) { _ in
-				self.coordinator.showAddWebFeed()
+			let addFeedActionTitle = NSLocalizedString("Add Feed", comment: "Add Feed")
+			let addFeedAction = UIAlertAction(title: addFeedActionTitle, style: .default) { _ in
+				self.coordinator.showAddFeed()
 			}
 			
 			let addWebFolderdActionTitle = NSLocalizedString("Add Folder", comment: "Add Folder")
@@ -449,7 +449,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 				self.coordinator.showAddFolder()
 			}
 			
-			alertController.addAction(addWebFeedAction)
+			alertController.addAction(addFeedAction)
 			
 			alertController.addAction(addWebFolderAction)
 			alertController.addAction(cancelAction)
@@ -649,11 +649,11 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 			
 			var menuItems: [UIAction] = []
 			
-			let addWebFeedActionTitle = NSLocalizedString("Add Feed", comment: "Add Feed")
-			let addWebFeedAction = UIAction(title: addWebFeedActionTitle, image: AppAssets.plus) { _ in
-				self.coordinator.showAddWebFeed()
+			let addFeedActionTitle = NSLocalizedString("Add Feed", comment: "Add Feed")
+			let addFeedAction = UIAction(title: addFeedActionTitle, image: AppAssets.plus) { _ in
+				self.coordinator.showAddFeed()
 			}
-			menuItems.append(addWebFeedAction)
+			menuItems.append(addFeedAction)
 			
 			let addWebFolderActionTitle = NSLocalizedString("Add Folder", comment: "Add Folder")
 			let addWebFolderAction = UIAction(title: addWebFolderActionTitle, image: AppAssets.folderOutlinePlus) { _ in
@@ -896,7 +896,7 @@ private extension MasterFeedViewController {
 		coordinator.collapse(node)
 	}

-	func makeWebFeedContextMenu(indexPath: IndexPath, includeDeleteRename: Bool) -> UIContextMenuConfiguration {
+	func makeFeedContextMenu(indexPath: IndexPath, includeDeleteRename: Bool) -> UIContextMenuConfiguration {
 		return UIContextMenuConfiguration(identifier: MasterFeedRowIdentifier(indexPath: indexPath), previewProvider: nil, actionProvider: { [ weak self] suggestedActions in
 			
 			guard let self = self else { return nil }
@@ -1000,8 +1000,8 @@ private extension MasterFeedViewController {
 	}
 	
 	func copyFeedPageAction(indexPath: IndexPath) -> UIAction? {
-		guard let webFeed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
-			  let url = URL(string: webFeed.url) else {
+		guard let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
+			  let url = URL(string: feed.url) else {
 				  return nil
 			  }
 		
@@ -1013,8 +1013,8 @@ private extension MasterFeedViewController {
 	}
 	
 	func copyFeedPageAlertAction(indexPath: IndexPath, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
-		guard let webFeed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
-			  let url = URL(string: webFeed.url) else {
+		guard let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
+			  let url = URL(string: feed.url) else {
 				  return nil
 			  }

@@ -1027,8 +1027,8 @@ private extension MasterFeedViewController {
 	}
 	
 	func copyHomePageAction(indexPath: IndexPath) -> UIAction? {
-		guard let webFeed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
-			  let homePageURL = webFeed.homePageURL,
+		guard let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
+			  let homePageURL = feed.homePageURL,
 			  let url = URL(string: homePageURL) else {
 				  return nil
 			  }
@@ -1041,8 +1041,8 @@ private extension MasterFeedViewController {
 	}
 	
 	func copyHomePageAlertAction(indexPath: IndexPath, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
-		guard let webFeed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
-			  let homePageURL = webFeed.homePageURL,
+		guard let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
+			  let homePageURL = feed.homePageURL,
 			  let url = URL(string: homePageURL) else {
 				  return nil
 			  }
@@ -1056,14 +1056,14 @@ private extension MasterFeedViewController {
 	}
 	
 	func markAllAsReadAlertAction(indexPath: IndexPath, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
-		guard let webFeed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
-			webFeed.unreadCount > 0,
-			let articles = try? webFeed.fetchArticles(), let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else {
+		guard let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed,
+			feed.unreadCount > 0,
+			let articles = try? feed.fetchArticles(), let contentView = self.tableView.cellForRow(at: indexPath)?.contentView else {
 				return nil
 		}
 		
 		let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command")
-		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, webFeed.nameForDisplay) as String
+		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, feed.nameForDisplay) as String
 		let cancel = {
 			completion(true)
 		}
@@ -1096,13 +1096,13 @@ private extension MasterFeedViewController {
 	}
 	
 	func getInfoAction(indexPath: IndexPath) -> UIAction? {
-		guard let webFeed = coordinator.nodeFor(indexPath)?.representedObject as? Feed else {
+		guard let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed else {
 			return nil
 		}
 		
 		let title = NSLocalizedString("Get Info", comment: "Get Info")
 		let action = UIAction(title: title, image: AppAssets.infoImage) { [weak self] action in
-			self?.coordinator.showFeedInspector(for: webFeed)
+			self?.coordinator.showFeedInspector(for: feed)
 		}
 		return action
 	}
@@ -1124,13 +1124,13 @@ private extension MasterFeedViewController {
 	}

 	func getInfoAlertAction(indexPath: IndexPath, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
-		guard let webFeed = coordinator.nodeFor(indexPath)?.representedObject as? Feed else {
+		guard let feed = coordinator.nodeFor(indexPath)?.representedObject as? Feed else {
 			return nil
 		}

 		let title = NSLocalizedString("Get Info", comment: "Get Info")
 		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
-			self?.coordinator.showFeedInspector(for: webFeed)
+			self?.coordinator.showFeedInspector(for: feed)
 			completion(true)
 		}
 		return action
@@ -1196,8 +1196,8 @@ private extension MasterFeedViewController {
 				return
 			}
 			
-			if let webFeed = feed as? Feed {
-				webFeed.rename(to: name) { result in
+			if let feed = feed as? Feed {
+				feed.rename(to: name) { result in
 					switch result {
 					case .success:
 						break
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -52,7 +52,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner

 		NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(statusesDidChange(_:)), name: .StatusesDidChange, object: nil)
-		NotificationCenter.default.addObserver(self, selector: #selector(webFeedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
+		NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(avatarDidBecomeAvailable(_:)), name: .AvatarDidBecomeAvailable, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(faviconDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil)
@@ -447,7 +447,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		}
 	}

-	@objc func webFeedIconDidBecomeAvailable(_ note: Notification) {
+	@objc func feedIconDidBecomeAvailable(_ note: Notification) {
 		
 		if let titleView = navigationItem.titleView as? MasterTimelineTitleView {
 			titleView.iconView.iconImage = coordinator.timelineIconImage
@@ -548,7 +548,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		
 		let prototypeID = "prototype"
 		let status = ArticleStatus(articleID: prototypeID, read: false, starred: false, dateArrived: Date())
-		let prototypeArticle = Article(accountID: prototypeID, articleID: prototypeID, webFeedID: prototypeID, uniqueID: prototypeID, title: longTitle, contentHTML: nil, contentText: nil, url: nil, externalURL: nil, summary: nil, imageURL: nil, datePublished: nil, dateModified: nil, authors: nil, status: status)
+		let prototypeArticle = Article(accountID: prototypeID, articleID: prototypeID, feedID: prototypeID, uniqueID: prototypeID, title: longTitle, contentHTML: nil, contentText: nil, url: nil, externalURL: nil, summary: nil, imageURL: nil, datePublished: nil, dateModified: nil, authors: nil, status: status)
 		
 		let prototypeCellData = MasterTimelineCellData(article: prototypeArticle, showFeedName: .feed, feedName: "Prototype Feed Name", byline: nil, iconImage: nil, showIcon: false, featuredImage: nil, numberOfLines: numberOfTextLines, iconSize: iconSize)
 		
@@ -846,31 +846,31 @@ private extension MasterTimelineViewController {
 	}
 	
 	func discloseFeedAction(_ article: Article) -> UIAction? {
-		guard let webFeed = article.feed,
-			!coordinator.timelineFeedIsEqualTo(webFeed) else { return nil }
+		guard let feed = article.feed,
+			!coordinator.timelineFeedIsEqualTo(feed) else { return nil }
 		
 		let title = NSLocalizedString("Go to Feed", comment: "Go to Feed")
 		let action = UIAction(title: title, image: AppAssets.openInSidebarImage) { [weak self] action in
-			self?.coordinator.discloseWebFeed(webFeed, animations: [.scroll, .navigation])
+			self?.coordinator.discloseFeed(feed, animations: [.scroll, .navigation])
 		}
 		return action
 	}
 	
 	func discloseFeedAlertAction(_ article: Article, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
-		guard let webFeed = article.feed,
-			!coordinator.timelineFeedIsEqualTo(webFeed) else { return nil }
+		guard let feed = article.feed,
+			!coordinator.timelineFeedIsEqualTo(feed) else { return nil }

 		let title = NSLocalizedString("Go to Feed", comment: "Go to Feed")
 		let action = UIAlertAction(title: title, style: .default) { [weak self] action in
-			self?.coordinator.discloseWebFeed(webFeed, animations: [.scroll, .navigation])
+			self?.coordinator.discloseFeed(feed, animations: [.scroll, .navigation])
 			completion(true)
 		}
 		return action
 	}
 	
 	func markAllInFeedAsReadAction(_ article: Article, indexPath: IndexPath) -> UIAction? {
-		guard let webFeed = article.feed else { return nil }
-		guard let fetchedArticles = try? webFeed.fetchArticles() else {
+		guard let feed = article.feed else { return nil }
+		guard let fetchedArticles = try? feed.fetchArticles() else {
 			return nil
 		}

@@ -881,7 +881,7 @@ private extension MasterTimelineViewController {
 		
 		
 		let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Command")
-		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, webFeed.nameForDisplay) as String
+		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, feed.nameForDisplay) as String
 		
 		let action = UIAction(title: title, image: AppAssets.markAllAsReadImage) { [weak self] action in
 			MarkAsReadAlertController.confirm(self, coordinator: self?.coordinator, confirmTitle: title, sourceType: contentView) { [weak self] in
@@ -892,8 +892,8 @@ private extension MasterTimelineViewController {
 	}

 	func markAllInFeedAsReadAlertAction(_ article: Article, indexPath: IndexPath, completion: @escaping (Bool) -> Void) -> UIAlertAction? {
-		guard let webFeed = article.feed else { return nil }
-		guard let fetchedArticles = try? webFeed.fetchArticles() else {
+		guard let feed = article.feed else { return nil }
+		guard let fetchedArticles = try? feed.fetchArticles() else {
 			return nil
 		}
 		
@@ -903,7 +903,7 @@ private extension MasterTimelineViewController {
 		}
 		
 		let localizedMenuText = NSLocalizedString("Mark All as Read in “%@”", comment: "Mark All as Read in Feed")
-		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, webFeed.nameForDisplay) as String
+		let title = NSString.localizedStringWithFormat(localizedMenuText as NSString, feed.nameForDisplay) as String
 		let cancel = {
 			completion(true)
 		}
--- a/iOS/RootSplitViewController.swift
+++ b/iOS/RootSplitViewController.swift
@@ -96,7 +96,7 @@ class RootSplitViewController: UISplitViewController {
 	}
 	
 	@objc func addNewFeed(_ sender: Any?) {
-		coordinator.showAddWebFeed()
+		coordinator.showAddFeed()
 	}

 	@objc func addNewFolder(_ sender: Any?) {
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -397,7 +397,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 			case .readArticle:
 				self.handleReadArticle(activity.userInfo)
 			case .addFeedIntent:
-				self.showAddWebFeed()
+				self.showAddFeed()
 			}
 		}
 	}
@@ -545,10 +545,10 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 	}

 	@objc func userDidAddFeed(_ notification: Notification) {
-		guard let webFeed = notification.userInfo?[UserInfoKey.feed] as? Feed else {
+		guard let feed = notification.userInfo?[UserInfoKey.feed] as? Feed else {
 			return
 		}
-		discloseWebFeed(webFeed, animations: [.scroll, .navigation])
+		discloseFeed(feed, animations: [.scroll, .navigation])
 	}
 	
 	@objc func userDefaultsDidChange(_ note: Notification) {
@@ -557,7 +557,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 	}
 	
 	@objc func accountDidDownloadArticles(_ note: Notification) {
-		guard let feeds = note.userInfo?[Account.UserInfoKey.webFeeds] as? Set<Feed> else {
+		guard let feeds = note.userInfo?[Account.UserInfoKey.feeds] as? Set<Feed> else {
 			return
 		}
 		
@@ -1128,25 +1128,25 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 		return timelineFeed == feed
 	}

-	func discloseWebFeed(_ webFeed: Feed, initialLoad: Bool = false, animations: Animations = [], completion: (() -> Void)? = nil) {
+	func discloseFeed(_ feed: Feed, initialLoad: Bool = false, animations: Animations = [], completion: (() -> Void)? = nil) {
 		if isSearching {
 			masterTimelineViewController?.hideSearch()
 		}
 		
-		guard let account = webFeed.account else {
+		guard let account = feed.account else {
 			completion?()
 			return
 		}
 		
-		let parentFolder = account.sortedFolders?.first(where: { $0.objectIsChild(webFeed) })
+		let parentFolder = account.sortedFolders?.first(where: { $0.objectIsChild(feed) })
 		
 		markExpanded(account)
 		if let parentFolder = parentFolder {
 			markExpanded(parentFolder)
 		}
 	
-		if let webFeedFeedID = webFeed.sidebarItemID {
-			self.treeControllerDelegate.addFilterException(webFeedFeedID)
+		if let sidebarItemID = feed.sidebarItemID {
+			self.treeControllerDelegate.addFilterException(sidebarItemID)
 		}
 		if let parentFolderFeedID = parentFolder?.sidebarItemID {
 			self.treeControllerDelegate.addFilterException(parentFolderFeedID)
@@ -1155,7 +1155,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 		rebuildBackingStores(initialLoad: initialLoad, completion:  {
 			self.treeControllerDelegate.resetFilterExceptions()
 			self.selectFeed(nil) {
-				self.selectFeed(webFeed, animations: animations, completion: completion)
+				self.selectFeed(feed, animations: animations, completion: completion)
 			}
 		})
 		
@@ -1196,9 +1196,9 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 	}
 	
 	func showFeedInspector() {
-		let timelineWebFeed = timelineFeed as? Feed
+		let timelineFeed = timelineFeed as? Feed
 		let articleFeed = currentArticle?.feed
-		guard let feed = timelineWebFeed ?? articleFeed else {
+		guard let feed = timelineFeed ?? articleFeed else {
 			return
 		}
 		showFeedInspector(for: feed)
@@ -1207,19 +1207,19 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 	func showFeedInspector(for feed: Feed) {
 		let feedInspectorNavController =
 			UIStoryboard.inspector.instantiateViewController(identifier: "FeedInspectorNavigationViewController") as! UINavigationController
-		let feedInspectorController = feedInspectorNavController.topViewController as! WebFeedInspectorViewController
+		let feedInspectorController = feedInspectorNavController.topViewController as! FeedInspectorViewController
 		feedInspectorNavController.modalPresentationStyle = .formSheet
-		feedInspectorNavController.preferredContentSize = WebFeedInspectorViewController.preferredContentSizeForFormSheetDisplay
-		feedInspectorController.webFeed = feed
+		feedInspectorNavController.preferredContentSize = FeedInspectorViewController.preferredContentSizeForFormSheetDisplay
+		feedInspectorController.feed = feed
 		rootSplitViewController.present(feedInspectorNavController, animated: true)
 	}
 	
-	func showAddWebFeed(initialFeed: String? = nil, initialFeedName: String? = nil) {
+	func showAddFeed(initialFeed: String? = nil, initialFeedName: String? = nil) {
 		
 		// Since Add Feed can be opened from anywhere with a keyboard shortcut, we have to deselect any currently selected feeds
 		selectFeed(nil)

-		let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewControllerNav") as! UINavigationController
+		let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFeedViewControllerNav") as! UINavigationController
 		
 		let addViewController = addNavViewController.topViewController as! AddFeedViewController
 		addViewController.initialFeed = initialFeed
@@ -1476,10 +1476,10 @@ private extension SceneCoordinator {
 				if folderFeed.account?.existingFolder(withID: folderFeed.folderID) != nil {
 					treeControllerDelegate.addFilterException(feedID)
 				}
-			} else if let webFeed = feed as? Feed {
-				if webFeed.account?.existingWebFeed(withWebFeedID: webFeed.feedID) != nil {
+			} else if let feed = feed as? Feed {
+				if feed.account?.existingFeed(withFeedID: feed.feedID) != nil {
 					treeControllerDelegate.addFilterException(feedID)
-					addParentFolderToFilterExceptions(webFeed)
+					addParentFolderToFilterExceptions(feed)
 				}
 			}
 		}
@@ -2002,7 +2002,7 @@ private extension SceneCoordinator {
 				if !unsortedArticleIDs.contains(article.articleID) {
 					updatedArticles.insert(article)
 				}
-				if article.account?.existingWebFeed(withWebFeedID: article.webFeedID) == nil {
+				if article.account?.existingFeed(withFeedID: article.feedID) == nil {
 					updatedArticles.remove(article)
 				}
 			}
@@ -2086,7 +2086,7 @@ private extension SceneCoordinator {
 			}
 		} else if let folder = timelineFeed as? Folder {
 			for oneFeed in feeds {
-				if folder.hasWebFeed(with: oneFeed.feedID) || folder.hasFeed(withURL: oneFeed.url) {
+				if folder.hasFeed(with: oneFeed.feedID) || folder.hasFeed(withURL: oneFeed.url) {
 					return true
 				}
 			}
@@ -2284,14 +2284,14 @@ private extension SceneCoordinator {
 				}
 			})
 		
-		case .webFeed(let accountID, let webFeedID):
+		case .feed(let accountID, let feedID):
 			guard let accountNode = findAccountNode(accountID: accountID),
 				let account = accountNode.representedObject as? Account,
-				let webFeed = account.existingWebFeed(withWebFeedID: webFeedID) else {
+				let feed = account.existingFeed(withFeedID: feedID) else {
 				return
 			}
 			
-			self.discloseWebFeed(webFeed, initialLoad: true) {
+			self.discloseFeed(feed, initialLoad: true) {
 				self.masterFeedViewController.focus()
 			}
 		}
@@ -2303,7 +2303,7 @@ private extension SceneCoordinator {
 		guard let articlePathUserInfo = userInfo[UserInfoKey.articlePath] as? [AnyHashable : Any],
 			  let accountID = articlePathUserInfo[ArticlePathKey.accountID] as? String,
 			  let accountName = articlePathUserInfo[ArticlePathKey.accountName] as? String,
-			  let webFeedID = articlePathUserInfo[ArticlePathKey.webFeedID] as? String,
+			  let feedID = articlePathUserInfo[ArticlePathKey.feedID] as? String,
 			  let articleID = articlePathUserInfo[ArticlePathKey.articleID] as? String,
 			  let accountNode = findAccountNode(accountID: accountID, accountName: accountName),
 			  let account = accountNode.representedObject as? Account else {
@@ -2312,20 +2312,20 @@ private extension SceneCoordinator {
 		
 		exceptionArticleFetcher = SingleArticleFetcher(account: account, articleID: articleID)

-		if restoreFeedSelection(userInfo, accountID: accountID, webFeedID: webFeedID, articleID: articleID) {
+		if restoreFeedSelection(userInfo, accountID: accountID, feedID: feedID, articleID: articleID) {
 			return
 		}
 		
-		guard let webFeed = account.existingWebFeed(withWebFeedID: webFeedID) else {
+		guard let feed = account.existingFeed(withFeedID: feedID) else {
 			return
 		}
 		
-		discloseWebFeed(webFeed) {
+		discloseFeed(feed) {
 			self.selectArticleInCurrentFeed(articleID)
 		}
 	}
 	
-	func restoreFeedSelection(_ userInfo: [AnyHashable : Any], accountID: String, webFeedID: String, articleID: String) -> Bool {
+	func restoreFeedSelection(_ userInfo: [AnyHashable : Any], accountID: String, feedID: String, articleID: String) -> Bool {
 		guard let feedIdentifierUserInfo = userInfo[UserInfoKey.feedIdentifier] as? [AnyHashable : AnyHashable],
 			  let feedIdentifier = SidebarItemIdentifier(userInfo: feedIdentifierUserInfo),
 			  let isShowingExtractedArticle = userInfo[UserInfoKey.isShowingExtractedArticle] as? Bool,
@@ -2345,11 +2345,11 @@ private extension SceneCoordinator {
 			}
 			return found
 		
-		case .webFeed:
+		case .feed:
 			let found = selectFeedAndArticle(feedIdentifier: feedIdentifier, articleID: articleID, isShowingExtractedArticle: isShowingExtractedArticle, articleWindowScrollY: articleWindowScrollY)
 			if found {
 				treeControllerDelegate.addFilterException(feedIdentifier)
-				if let webFeedNode = nodeFor(feedID: feedIdentifier), let folder = webFeedNode.parent?.representedObject as? Folder, let folderFeedID = folder.sidebarItemID {
+				if let feedNode = nodeFor(feedID: feedIdentifier), let folder = feedNode.parent?.representedObject as? Folder, let folderFeedID = folder.sidebarItemID {
 					treeControllerDelegate.addFilterException(folderFeedID)
 				}
 			}
@@ -2378,8 +2378,8 @@ private extension SceneCoordinator {
 		return nil
 	}

-	func findWebFeedNode(webFeedID: String, beginningAt startingNode: Node) -> Node? {
-		if let node = startingNode.descendantNode(where: { ($0.representedObject as? Feed)?.feedID == webFeedID }) {
+	func findFeedNode(feedID: String, beginningAt startingNode: Node) -> Node? {
+		if let node = startingNode.descendantNode(where: { ($0.representedObject as? Feed)?.feedID == feedID }) {
 			return node
 		}
 		return nil
--- a/iOS/SceneDelegate.swift
+++ b/iOS/SceneDelegate.swift
@@ -112,7 +112,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 			if urlString.starts(with: "feed:") || urlString.starts(with: "feeds:") {
 				let normalizedURLString = urlString.normalizedURL
 				if normalizedURLString.mayBeURL {
-					self.coordinator.showAddWebFeed(initialFeed: normalizedURLString, initialFeedName: nil)
+					self.coordinator.showAddFeed(initialFeed: normalizedURLString, initialFeedName: nil)
 				}
 			}
 			
@@ -217,7 +217,7 @@ private extension SceneDelegate {
 		case "com.ranchero.NetNewsWire.ShowSearch":
 			coordinator.showSearch()
 		case "com.ranchero.NetNewsWire.ShowAdd":
-			coordinator.showAddWebFeed()
+			coordinator.showAddFeed()
 		default:
 			break
 		}
--- a/iOS/Settings/SettingsViewController.swift
+++ b/iOS/Settings/SettingsViewController.swift
@@ -371,7 +371,7 @@ private extension SettingsViewController {
 	func addFeed() {
 		self.dismiss(animated: true)

-		let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddWebFeedViewControllerNav") as! UINavigationController
+		let addNavViewController = UIStoryboard.add.instantiateViewController(withIdentifier: "AddFeedViewControllerNav") as! UINavigationController
 		let addViewController = addNavViewController.topViewController as! AddFeedViewController
 		addViewController.initialFeed = AccountManager.netNewsWireNewsURL
 		addViewController.initialFeedName = NSLocalizedString("NetNewsWire News", comment: "NetNewsWire News")
--- a/iOS/Settings/TimelinePreviewTableViewController.swift
+++ b/iOS/Settings/TimelinePreviewTableViewController.swift
@@ -67,7 +67,7 @@ private extension TimelinePreviewTableViewController {
 		
 		let prototypeID = "prototype"
 		let status = ArticleStatus(articleID: prototypeID, read: false, starred: false, dateArrived: Date())
-		let prototypeArticle = Article(accountID: prototypeID, articleID: prototypeID, webFeedID: prototypeID, uniqueID: prototypeID, title: longTitle, contentHTML: nil, contentText: nil, url: nil, externalURL: nil, summary: nil, imageURL: nil, datePublished: nil, dateModified: nil, authors: nil, status: status)
+		let prototypeArticle = Article(accountID: prototypeID, articleID: prototypeID, feedID: prototypeID, uniqueID: prototypeID, title: longTitle, contentHTML: nil, contentText: nil, url: nil, externalURL: nil, summary: nil, imageURL: nil, datePublished: nil, dateModified: nil, authors: nil, status: status)
 		
 		let iconImage = IconImage(AppAssets.faviconTemplateImage.withTintColor(AppAssets.secondaryAccentColor))