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

Fix feed handling that was causing starred article sharing to bug out.

This commit is contained in:
Maurice Parker 2020-04-03 14:19:31 -05:00
parent 260551ebb1
commit c454aa88b8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Frameworks/Account/CloudKit/CloudKitArticlesZone.swift
View File

@ -30,7 +30,7 @@ final class CloudKitArticlesZone: CloudKitZone {
static let recordType = "Article" static let recordType = "Article"
struct Fields { struct Fields {
static let articleStatus = "articleStatus" static let articleStatus = "articleStatus"
static let webFeedID = "webFeedID" static let webFeedURL = "webFeedURL"
static let uniqueID = "uniqueID" static let uniqueID = "uniqueID"
static let title = "title" static let title = "title"
static let contentHTML = "contentHTML" static let contentHTML = "contentHTML"
@ -145,7 +145,7 @@ private extension CloudKitArticlesZone {
let articleStatusRecordID = CKRecord.ID(recordName: article.articleID, zoneID: Self.zoneID) let articleStatusRecordID = CKRecord.ID(recordName: article.articleID, zoneID: Self.zoneID)
articleRecord[CloudKitArticle.Fields.articleStatus] = CKRecord.Reference(recordID: articleStatusRecordID, action: .deleteSelf) articleRecord[CloudKitArticle.Fields.articleStatus] = CKRecord.Reference(recordID: articleStatusRecordID, action: .deleteSelf)
articleRecord[CloudKitArticle.Fields.webFeedID] = article.webFeedID articleRecord[CloudKitArticle.Fields.webFeedURL] = article.webFeed?.url
articleRecord[CloudKitArticle.Fields.uniqueID] = article.uniqueID articleRecord[CloudKitArticle.Fields.uniqueID] = article.uniqueID
articleRecord[CloudKitArticle.Fields.title] = article.title articleRecord[CloudKitArticle.Fields.title] = article.title
articleRecord[CloudKitArticle.Fields.contentHTML] = article.contentHTML articleRecord[CloudKitArticle.Fields.contentHTML] = article.contentHTML

8
Frameworks/Account/CloudKit/CloudKitArticlesZoneDelegate.swift
View File

@ -102,9 +102,9 @@ private extension CloudKitArticlesZoneDelegate {
} }
for receivedStarredArticle in receivedStarredArticles { for receivedStarredArticle in receivedStarredArticles {
if let parsedItem = makeParsedItem(receivedStarredArticle), let statusRef = receivedStarredArticle[CloudKitArticlesZone.CloudKitArticle.Fields.articleStatus] as? CKRecord.Reference { if let parsedItem = makeParsedItem(receivedStarredArticle) {
group.enter() group.enter()
self.account?.update(statusRef.recordID.externalID, with: Set([parsedItem])) { databaseError in self.account?.update(parsedItem.feedURL, with: Set([parsedItem])) { databaseError in
group.leave() group.leave()
if let databaseError = databaseError { if let databaseError = databaseError {
os_log(.error, log: self.log, "Error occurred while storing starred items: %@", databaseError.localizedDescription) os_log(.error, log: self.log, "Error occurred while storing starred items: %@", databaseError.localizedDescription)
@ -134,13 +134,13 @@ private extension CloudKitArticlesZoneDelegate {
} }
guard let uniqueID = articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.uniqueID] as? String, guard let uniqueID = articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.uniqueID] as? String,
let feedURL = articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.webFeedID] as? String else { let webFeedURL = articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.webFeedURL] as? String else {
return nil return nil
} }
let parsedItem = ParsedItem(syncServiceID: nil, let parsedItem = ParsedItem(syncServiceID: nil,
uniqueID: uniqueID, uniqueID: uniqueID,
feedURL: feedURL, feedURL: webFeedURL,
url: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.url] as? String, url: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.url] as? String,
externalURL: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.externalURL] as? String, externalURL: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.externalURL] as? String,
title: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.title] as? String, title: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.title] as? String,