tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

purple: fix crash in account cache

Browse Source 
otherwise there is contention and tends to crash

Fixes: f06b882139 ("purple: consolidate UserBadgeInfo with Account")
Changelog-Fixed: Fix crash when accessing cached purple accounts
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-02-01 11:05:16 -08:00
parent 4a40c9987d
commit 3d190a7388
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
damus/Models/Purple/DamusPurple.swift
View File

@@ -10,6 +10,8 @@ import Foundation
class DamusPurple: StoreObserverDelegate { class DamusPurple: StoreObserverDelegate {
let settings: UserSettingsStore let settings: UserSettingsStore
let keypair: Keypair let keypair: Keypair
@MainActor
var account_cache: [Pubkey: Account] var account_cache: [Pubkey: Account]
init(settings: UserSettingsStore, keypair: Keypair) { init(settings: UserSettingsStore, keypair: Keypair) {
@@ -49,6 +51,7 @@ class DamusPurple: StoreObserverDelegate {
return false return false
} }
@MainActor
func get_maybe_cached_account(pubkey: Pubkey) async throws -> Account? { func get_maybe_cached_account(pubkey: Pubkey) async throws -> Account? {
if let account = self.account_cache[pubkey] { if let account = self.account_cache[pubkey] {
return account return account
@@ -56,6 +59,7 @@ class DamusPurple: StoreObserverDelegate {
return try await fetch_account(pubkey: pubkey) return try await fetch_account(pubkey: pubkey)
} }
@MainActor
func fetch_account(pubkey: Pubkey) async throws -> Account? { func fetch_account(pubkey: Pubkey) async throws -> Account? {
guard let data = try await self.get_account_data(pubkey: pubkey) , guard let data = try await self.get_account_data(pubkey: pubkey) ,
let account = Account.from(json_data: data) else { let account = Account.from(json_data: data) else {