FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1418 from Wevah/app-feed-icons-deux 

Return the app icon earlier so we never hit the favicon cache
This commit is contained in:
Maurice Parker 2019-12-07 15:19:16 -07:00 committed by GitHub
parent 91908aa29a 71bc1e5d8a
commit efcdc50df0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shared/Favicons/FaviconDownloader.swift
View File

@ -108,11 +108,6 @@ final class FaviconDownloader {
} }
func favicon(with faviconURL: String, homePageURL: String?) -> IconImage? { func favicon(with faviconURL: String, homePageURL: String?) -> IconImage? {
if let homePageURL = homePageURL, let url = URL(string: homePageURL) {
if url.host == "nnw.ranchero.com" {
return IconImage.appIcon
}
}
let downloader = faviconDownloader(withURL: faviconURL, homePageURL: homePageURL) let downloader = faviconDownloader(withURL: faviconURL, homePageURL: homePageURL)
return downloader.iconImage return downloader.iconImage
} }
@ -120,6 +115,13 @@ final class FaviconDownloader {
func favicon(withHomePageURL homePageURL: String) -> IconImage? { func favicon(withHomePageURL homePageURL: String) -> IconImage? {
let url = homePageURL.rs_normalizedURL() let url = homePageURL.rs_normalizedURL()
if let url = URL(string: homePageURL) {
if url.host == "nnw.ranchero.com" {
return IconImage.appIcon
}
}
if homePageURLsWithNoFaviconURLCache.contains(url) { if homePageURLsWithNoFaviconURLCache.contains(url) {
return nil return nil
} }