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

Leverage new avatarImage function from ArticleUtilities to reduce code duplication between macOS and iOS

This commit is contained in:
Maurice Parker 2019-08-24 15:01:28 -05:00
parent 5b1c0485c5
commit ea55aa5bef
1 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Mac/MainWindow/Timeline/TimelineViewController.swift
View File

@ -768,44 +768,12 @@ extension TimelineViewController: NSTableViewDelegate {
private func configureTimelineCell(_ cell: TimelineTableCellView, article: Article) {
cell.objectValue = article
let avatar = avatarFor(article)
let avatar = article.avatarImage()
let featuredImage = featuredImageFor(article)
cell.cellData = TimelineCellData(article: article, showFeedName: showFeedNames, feedName: article.feed?.nameForDisplay, avatar: avatar, showAvatar: showAvatars, featuredImage: featuredImage)
}
private func avatarFor(_ article: Article) -> NSImage? {
if !showAvatars {
return nil
}
if let authors = article.authors {
for author in authors {
if let image = avatarForAuthor(author) {
return image
}
}
}
guard let feed = article.feed else {
return nil
}
if let feedIcon = appDelegate.feedIconDownloader.icon(for: feed) {
return feedIcon
}
if let favicon = appDelegate.faviconDownloader.faviconAsAvatar(for: feed) {
return favicon
}
return FaviconGenerator.favicon(feed)
}
private func avatarForAuthor(_ author: Author) -> NSImage? {
return appDelegate.authorAvatarDownloader.image(for: author)
}
private func featuredImageFor(_ article: Article) -> NSImage? {
// At this writing (17 June 2019) we’re not displaying featured images anywhere,
// so let’s skip downloading them even if we find them.