Compare commits

..

No commits in common. "5471d810c86202e3f8a161c0c327de005f85f9a3" and "ee630cf9df26915787c354b7cbaf8dafac3e7d7b" have entirely different histories.

2 changed files with 3 additions and 5 deletions

View File

@ -94,7 +94,7 @@ class ReblogService {
status.favourited = oldValue status.favourited = oldValue
mastodonController.persistentContainer.statusSubject.send(status.id) mastodonController.persistentContainer.statusSubject.send(status.id)
let title = oldValue ? "Error Unreblogging" : "Error Reblogging" let title = oldValue ? "Error Unfavoriting" : "Error Favoriting"
let config = ToastConfiguration(from: error, with: title, in: presenter) { toast in let config = ToastConfiguration(from: error, with: title, in: presenter) { toast in
toast.dismissToast(animated: true) toast.dismissToast(animated: true)
await self.toggleReblog() await self.toggleReblog()

View File

@ -24,17 +24,15 @@ public final class AccountPreferences: NSManagedObject {
@NSManaged var createdAt: Date @NSManaged var createdAt: Date
@NSManaged var pinnedTimelinesData: Data? @NSManaged var pinnedTimelinesData: Data?
@LazilyDecoding(from: \AccountPreferences.pinnedTimelinesData, fallback: AccountPreferences.defaultPinnedTimelines) @LazilyDecoding(from: \AccountPreferences.pinnedTimelinesData, fallback: [])
var pinnedTimelines: [PinnedTimeline] var pinnedTimelines: [PinnedTimeline]
static func `default`(account: LocalData.UserAccountInfo, context: NSManagedObjectContext) -> AccountPreferences { static func `default`(account: LocalData.UserAccountInfo, context: NSManagedObjectContext) -> AccountPreferences {
let prefs = AccountPreferences(context: context) let prefs = AccountPreferences(context: context)
prefs.accountID = account.id prefs.accountID = account.id
prefs.createdAt = Date() prefs.createdAt = Date()
prefs.pinnedTimelines = Self.defaultPinnedTimelines prefs.pinnedTimelines = [.home, .public(local: true), .public(local: false)]
return prefs return prefs
} }
private static let defaultPinnedTimelines = [PinnedTimeline.home, .public(local: true), .public(local: false)]
} }