neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-16 02:03:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes error fetching Friend Zone patrons due to unexpected nil name

Browse Source
This commit is contained in:
Riley Testut
2023-03-28 14:37:47 -05:00
parent 6b42e82e3e
commit adaf7a2560
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AltStore/Operations/UpdatePatronsOperation.swift
View File

@@ -70,7 +70,7 @@ class UpdatePatronsOperation: ResultOperation<Void>
do do
{ {
let patrons = try result.get() let patrons = try result.get()
let managedPatrons = patrons.map { ManagedPatron(patron: $0, context: self.context) } let managedPatrons = patrons.compactMap { ManagedPatron(patron: $0, context: self.context) }
let patronIDs = Set(managedPatrons.map { $0.identifier }) let patronIDs = Set(managedPatrons.map { $0.identifier })
let nonFriendZonePredicate = NSPredicate(format: "NOT (%K IN %@)", #keyPath(ManagedPatron.identifier), patronIDs) let nonFriendZonePredicate = NSPredicate(format: "NOT (%K IN %@)", #keyPath(ManagedPatron.identifier), patronIDs)

7
AltStoreCore/Model/ManagedPatron.swift
View File

@@ -19,11 +19,14 @@ public class ManagedPatron: NSManagedObject, Fetchable
super.init(entity: entity, insertInto: context) super.init(entity: entity, insertInto: context)
} }
public init(patron: Patron, context: NSManagedObjectContext) public init?(patron: Patron, context: NSManagedObjectContext)
{ {
// Only cache Patrons with non-nil names.
guard let name = patron.name else { return nil }
super.init(entity: ManagedPatron.entity(), insertInto: context) super.init(entity: ManagedPatron.entity(), insertInto: context)
self.name = patron.name self.name = name
self.identifier = patron.identifier self.identifier = patron.identifier
} }
} }

4
AltStoreCore/Patreon/Patron.swift
View File

@@ -14,7 +14,7 @@ extension PatreonAPI
{ {
struct Attributes: Decodable struct Attributes: Decodable
{ {
var full_name: String var full_name: String?
var patron_status: String? var patron_status: String?
} }
@@ -54,7 +54,7 @@ extension Patron
public class Patron public class Patron
{ {
public var name: String public var name: String?
public var identifier: String public var identifier: String
public var status: Status public var status: Status