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

Make itemRefs an optional value since it isn't always returned by Inoreader

This commit is contained in:
Maurice Parker 2020-10-25 19:52:19 -05:00
parent 679cd40e84
commit 7ed311ebba
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Account/Sources/Account/ReaderAPI/ReaderAPICaller.swift
View File

@ -708,12 +708,12 @@ final class ReaderAPICaller: NSObject {
switch result { switch result {
case .success(let (_, entries)): case .success(let (_, entries)):
guard let entries = entries else { guard let entriesItemRefs = entries?.itemRefs else {
completion(.failure(ReaderAPIAccountDelegateError.invalidResponse)) completion(.failure(ReaderAPIAccountDelegateError.invalidResponse))
return return
} }
guard entries.itemRefs.count > 0 else { guard entriesItemRefs.count > 0 else {
completion(.success((nil, nil, nil))) completion(.success((nil, nil, nil)))
return return
} }
@ -728,7 +728,7 @@ final class ReaderAPICaller: NSObject {
request.httpMethod = "POST" request.httpMethod = "POST"
// Get ids from above into hex representation of value // Get ids from above into hex representation of value
let idsToFetch = entries.itemRefs.map({ (reference) -> String in let idsToFetch = entriesItemRefs.map({ (reference) -> String in
if self.variant == .theOldReader { if self.variant == .theOldReader {
return "i=tag:google.com,2005:reader/item/\(reference.itemId)" return "i=tag:google.com,2005:reader/item/\(reference.itemId)"
} else { } else {

2
Account/Sources/Account/ReaderAPI/ReaderAPIUnreadEntry.swift
View File

@ -9,7 +9,7 @@
import Foundation import Foundation
struct ReaderAPIReferenceWrapper: Codable { struct ReaderAPIReferenceWrapper: Codable {
let itemRefs: [ReaderAPIReference] let itemRefs: [ReaderAPIReference]?
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case itemRefs = "itemRefs" case itemRefs = "itemRefs"