From c366a55cb5769e7d6d808e01590fd20ef962af03 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 12 Nov 2019 15:36:03 -0600
Subject: [PATCH] Change to use Favicon generator.

---
 Mac/AppAssets.swift                               | 6 ------
 Mac/Inspector/FeedInspectorViewController.swift   | 2 +-
 Mac/MainWindow/SharingServicePickerDelegate.swift | 2 +-
 Mac/MainWindow/Sidebar/Cell/SidebarCell.swift     | 3 +--
 Shared/Data/SmallIconProvider.swift               | 4 ----
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift
index ddab9827d..644ce65ea 100644
--- a/Mac/AppAssets.swift
+++ b/Mac/AppAssets.swift
@@ -16,12 +16,6 @@ extension NSImage.Name {
 
 struct AppAssets {
 
-	static var genericFeedImage: IconImage? = {
-		let path = "/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/BookmarkIcon.icns"
-		let image = RSImage(contentsOfFile: path)
-		return image != nil ? IconImage(image!) : nil
-	}()
-
 	static var timelineStar: RSImage! = {
 		return RSImage(named: .timelineStar)
 	}()
diff --git a/Mac/Inspector/FeedInspectorViewController.swift b/Mac/Inspector/FeedInspectorViewController.swift
index 0c2bbd568..18ac3e770 100644
--- a/Mac/Inspector/FeedInspectorViewController.swift
+++ b/Mac/Inspector/FeedInspectorViewController.swift
@@ -119,7 +119,7 @@ private extension FeedInspectorViewController {
 			return
 		}
 
-		imageView?.image = AppAssets.genericFeedImage?.image
+		imageView?.image = feed.smallIcon?.image
 	}
 
 	func updateName() {
diff --git a/Mac/MainWindow/SharingServicePickerDelegate.swift b/Mac/MainWindow/SharingServicePickerDelegate.swift
index 5e2d38dc0..45cbd9eb7 100644
--- a/Mac/MainWindow/SharingServicePickerDelegate.swift
+++ b/Mac/MainWindow/SharingServicePickerDelegate.swift
@@ -41,7 +41,7 @@ import RSCore
 				return nil
 			}
 
-			let image = sendToCommand.image ?? AppAssets.genericFeedImage?.image ?? NSImage()
+			let image = sendToCommand.image ?? NSImage()
 			return NSSharingService(title: sendToCommand.title, image: image, alternateImage: nil) {
 				sendToCommand.sendObject(object, selectedText: nil)
 			}
diff --git a/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift b/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
index 610a51ace..7b021a073 100644
--- a/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
+++ b/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift
@@ -81,8 +81,7 @@ class SidebarCell : NSTableCellView {
 	}()
 
 	private let faviconImageView: NSImageView = {
-		let iconImage = AppAssets.genericFeedImage
-		let imageView = iconImage != nil ? NSImageView(image: iconImage!.image) : NSImageView(frame: NSRect.zero)
+		let imageView = NSImageView(frame: NSRect.zero)
 		imageView.animates = false
 		imageView.imageAlignment = .alignCenter
 		imageView.imageScaling = .scaleProportionallyDown
diff --git a/Shared/Data/SmallIconProvider.swift b/Shared/Data/SmallIconProvider.swift
index 968a9767c..a070dec30 100644
--- a/Shared/Data/SmallIconProvider.swift
+++ b/Shared/Data/SmallIconProvider.swift
@@ -22,11 +22,7 @@ extension Feed: SmallIconProvider {
 		if let iconImage = appDelegate.faviconDownloader.favicon(for: self) {
 			return iconImage
 		}
-		#if os(macOS)
-		return AppAssets.genericFeedImage
-		#else
 		return FaviconGenerator.favicon(self)
-		#endif
 	}
 }