pawelorzech/MacTorn_mirror
1
0
Fork 0
mirror of https://github.com/pawelorzech/MacTorn.git synced 2026-03-31 12:15:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7 from pawelorzech/fix/critical-bugs-phase1

Browse source 
Fix 3 critical bugs: infinite recursion, stuck loading, unstable IDs
This commit is contained in:
Paweł Orzech 2026-02-27 23:30:52 +01:00 committed by GitHub
commit 464bfea0a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
MacTorn/MacTorn/Models/TornModels.swift
View file

@ -373,7 +373,7 @@ struct AttackResult: Codable, Identifiable {
let result: String? let result: String?
let respect: Double? let respect: Double?
var id: String { code ?? UUID().uuidString } let id: String
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case code case code
@ -386,6 +386,33 @@ struct AttackResult: Codable, Identifiable {
case result, respect case result, respect
} }
init(code: String?, timestampStarted: Int?, timestampEnded: Int?, attackerId: Int?, attackerName: String?, defenderId: Int?, defenderName: String?, result: String?, respect: Double?) {
self.code = code
self.timestampStarted = timestampStarted
self.timestampEnded = timestampEnded
self.attackerId = attackerId
self.attackerName = attackerName
self.defenderId = defenderId
self.defenderName = defenderName
self.result = result
self.respect = respect
self.id = code ?? UUID().uuidString
}
init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
code = try container.decodeIfPresent(String.self, forKey: .code)
timestampStarted = try container.decodeIfPresent(Int.self, forKey: .timestampStarted)
timestampEnded = try container.decodeIfPresent(Int.self, forKey: .timestampEnded)
attackerId = try container.decodeIfPresent(Int.self, forKey: .attackerId)
attackerName = try container.decodeIfPresent(String.self, forKey: .attackerName)
defenderId = try container.decodeIfPresent(Int.self, forKey: .defenderId)
defenderName = try container.decodeIfPresent(String.self, forKey: .defenderName)
result = try container.decodeIfPresent(String.self, forKey: .result)
respect = try container.decodeIfPresent(Double.self, forKey: .respect)
id = code ?? UUID().uuidString
}
func opponentName(forUserId userId: Int) -> String { func opponentName(forUserId userId: Int) -> String {
let name: String? let name: String?
if attackerId == userId { if attackerId == userId {

3
MacTorn/MacTorn/ViewModels/AppState.swift
View file

@ -312,6 +312,9 @@ class AppState: ObservableObject {
} else { } else {
await updateItemError(itemId: itemId, error: "No listings") await updateItemError(itemId: itemId, error: "No listings")
} }
} else {
logger.error("Item \(itemId): failed to parse JSON response")
await updateItemError(itemId: itemId, error: "Parse Error")
} }
} catch { } catch {
logger.error("Item \(itemId) price fetch error: \(error.localizedDescription)") logger.error("Item \(itemId) price fetch error: \(error.localizedDescription)")

4
MacTorn/MacTornUITests/MacTornUITests.swift
View file

@ -136,8 +136,8 @@ final class MacTornUITests: XCTestCase {
// MARK: - UI Test Helpers // MARK: - UI Test Helpers
extension XCUIElement { extension XCUIElement {
/// Wait for element to exist with timeout /// Wait for element to appear within the given timeout
func waitForExistence(timeout: TimeInterval = 5) -> Bool { func waitForAppearance(timeout: TimeInterval = 5) -> Bool {
return self.waitForExistence(timeout: timeout) return self.waitForExistence(timeout: timeout)
} }