renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Continue renaming webFeed to feed.

Browse Source
This commit is contained in:
Brent Simmons
2024-11-02 11:08:58 -07:00
parent 2d3ef95619
commit 4fa4c6a541
95 changed files with 1156 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Shared/UserNotifications/UserNotificationManager.swift
View File

@@ -26,8 +26,8 @@ final class UserNotificationManager: NSObject {
}
for article in articles {
if !article.status.read, let webFeed = article.feed, webFeed.isNotifyAboutNewArticles ?? false {
sendNotification(webFeed: webFeed, article: article)
if !article.status.read, let feed = article.feed, feed.isNotifyAboutNewArticles ?? false {
sendNotification(feed: feed, article: article)
}
}
}
@@ -53,21 +53,21 @@ final class UserNotificationManager: NSObject {
private extension UserNotificationManager {
func sendNotification(webFeed: Feed, article: Article) {
func sendNotification(feed: Feed, article: Article) {
let content = UNMutableNotificationContent()
content.title = webFeed.nameForDisplay
content.title = feed.nameForDisplay
if !ArticleStringFormatter.truncatedTitle(article).isEmpty {
content.subtitle = ArticleStringFormatter.truncatedTitle(article)
}
content.body = ArticleStringFormatter.truncatedSummary(article)
content.threadIdentifier = webFeed.feedID
content.summaryArgument = "\(webFeed.nameForDisplay)"
content.threadIdentifier = feed.feedID
content.summaryArgument = "\(feed.nameForDisplay)"
content.summaryArgumentCount = 1
content.sound = UNNotificationSound.default
content.userInfo = [UserInfoKey.articlePath: article.pathUserInfo]
content.categoryIdentifier = "NEW_ARTICLE_NOTIFICATION_CATEGORY"
if let attachment = thumbnailAttachment(for: article, webFeed: webFeed) {
if let attachment = thumbnailAttachment(for: article, feed: feed) {
content.attachments.append(attachment)
}
@@ -78,12 +78,12 @@ private extension UserNotificationManager {
/// Determine if there is an available icon for the article. This will then move it to the caches directory and make it avialble for the notification.
/// - Parameters:
/// - article: `Article`
/// - webFeed: `WebFeed`
/// - feed: `Feed`
/// - Returns: A `UNNotifcationAttachment` if an icon is available. Otherwise nil.
/// - Warning: In certain scenarios, this will return the `faviconTemplateImage`.
func thumbnailAttachment(for article: Article, webFeed: Feed) -> UNNotificationAttachment? {
if let imageURL = article.iconImageUrl(webFeed: webFeed) {
let thumbnail = try? UNNotificationAttachment(identifier: webFeed.feedID, url: imageURL, options: nil)
func thumbnailAttachment(for article: Article, feed: Feed) -> UNNotificationAttachment? {
if let imageURL = article.iconImageUrl(feed: feed) {
let thumbnail = try? UNNotificationAttachment(identifier: feed.feedID, url: imageURL, options: nil)
return thumbnail
}
return nil