Merge pull request #8 from pawelorzech/fix/medium-priority-phase2

Fix safety issues, deprecated APIs, and code quality

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to MacTorn will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.1] - 2026-02-04
+
+### Added
+- Expanded browser support in browser picker with additional browser options
+
 ## [1.5.0] - 2026-02-04
 
 ### Added

MacTorn/MacTorn.xcodeproj/project.pbxproj

@@ -651,7 +651,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -678,7 +678,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -696,7 +696,7 @@
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -714,7 +714,7 @@
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -732,7 +732,7 @@
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -749,7 +749,7 @@
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;

MacTorn/MacTorn/MacTornApp.swift

@@ -14,7 +14,7 @@ struct MacTornApp: App {
                 .onAppear {
                     updateAppearance()
                 }
-                .onChange(of: appearanceModeRaw) { _ in
+                .onChange(of: appearanceModeRaw) {
                     updateAppearance()
                 }
         } label: {

MacTorn/MacTorn/Models/TornModels.swift

@@ -1,6 +1,11 @@
 import Foundation
 import SwiftUI
 
+// MARK: - Constants
+enum TornConstants {
+    static let developerID = 2362436
+}
+
 // MARK: - Root Response
 struct TornResponse: Codable {
     let name: String?
@@ -373,7 +378,7 @@ struct AttackResult: Codable, Identifiable {
     let result: String?
     let respect: Double?
 
-    var id: String { code ?? UUID().uuidString }
+    let id: String
 
     enum CodingKeys: String, CodingKey {
         case code
@@ -386,6 +391,33 @@ struct AttackResult: Codable, Identifiable {
         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 {
         let name: String?
         if attackerId == userId {

MacTorn/MacTorn/Utilities/BrowserManager.swift

@@ -7,26 +7,77 @@ enum PreferredBrowser: String, CaseIterable, Identifiable {
     case firefox = "Firefox"
     case edge = "Microsoft Edge"
     case brave = "Brave"
+    case arc = "Arc"
+    case vivaldi = "Vivaldi"
+    case zen = "Zen"
+    case opera = "Opera"
+    case duckduckgo = "DuckDuckGo"
+    case orion = "Orion"
+    case tor = "Tor Browser"
+    case chromium = "Chromium"
+    case librewolf = "LibreWolf"
+    case waterfox = "Waterfox"
+    case atlas = "ChatGPT Atlas"
 
     var id: String { rawValue }
 
-    var bundleIdentifier: String? {
+    var bundleIdentifiers: [String]? {
         switch self {
         case .system:
             return nil
         case .safari:
-            return "com.apple.Safari"
+            return ["com.apple.Safari"]
         case .chrome:
-            return "com.google.Chrome"
+            return ["com.google.Chrome"]
         case .firefox:
-            return "org.mozilla.firefox"
+            return ["org.mozilla.firefox"]
         case .edge:
-            return "com.microsoft.edgemac"
+            return ["com.microsoft.edgemac"]
         case .brave:
-            return "com.brave.Browser"
+            return ["com.brave.Browser"]
+        case .arc:
+            return ["company.thebrowser.Browser"]
+        case .vivaldi:
+            return ["com.vivaldi.Vivaldi"]
+        case .zen:
+            return ["app.zen-browser.zen"]
+        case .opera:
+            return ["com.operasoftware.Opera"]
+        case .duckduckgo:
+            return ["com.duckduckgo.macos.browser"]
+        case .orion:
+            return ["com.kagi.kagimacOS", "com.kagi.kagimacOS.RC"]
+        case .tor:
+            return ["com.torproject.tor"]
+        case .chromium:
+            return ["org.chromium.Chromium"]
+        case .librewolf:
+            return ["io.gitlab.librewolf-community"]
+        case .waterfox:
+            return ["net.waterfox.waterfox"]
+        case .atlas:
+            return ["com.openai.atlas"]
         }
     }
 
+    var installedApplicationURL: URL? {
+        guard let bundleIdentifiers else { return nil }
+        for bundleIdentifier in bundleIdentifiers {
+            if let appURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: bundleIdentifier) {
+                return appURL
+            }
+        }
+        return nil
+    }
+
+    var isInstalled: Bool {
+        self == .system || installedApplicationURL != nil
+    }
+
+    static func availableBrowsers() -> [PreferredBrowser] {
+        PreferredBrowser.allCases.filter { $0.isInstalled }
+    }
+
     init(storedValue: String?) {
         guard let storedValue,
               let value = PreferredBrowser(rawValue: storedValue) else {
@@ -50,8 +101,7 @@ final class BrowserManager {
         }
 
         let preference = PreferredBrowser(storedValue: UserDefaults.standard.string(forKey: "preferredBrowser"))
-        guard let bundleIdentifier = preference.bundleIdentifier,
-              let appURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: bundleIdentifier) else {
+        guard let appURL = preference.installedApplicationURL else {
             NSWorkspace.shared.open(url)
             return
         }

MacTorn/MacTorn/Utilities/NotificationManager.swift

@@ -103,14 +103,8 @@ class NotificationManager: NSObject, UNUserNotificationCenterDelegate {
 
     /// Cancel all travel-related notifications
     func cancelTravelNotifications() {
-        let identifiers = [
-            "travel_2min_alert",
-            "travel_1min_alert",
-            "travel_30sec_alert",
-            "travel_10sec_alert"
-        ]
+        let identifiers = TravelNotificationSetting.defaults.map { "\($0.id)_alert" }
         UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: identifiers)
-        print("Cancelled travel notifications")
     }
 
     /// Cancel a specific notification by identifier

MacTorn/MacTorn/ViewModels/AppState.swift

@@ -312,6 +312,9 @@ class AppState: ObservableObject {
                 } else {
                     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 {
             logger.error("Item \(itemId) price fetch error: \(error.localizedDescription)")
@@ -581,9 +584,7 @@ class AppState: ObservableObject {
             // Check if feedback prompt should be shown
             self.checkFeedbackPrompt()
 
-            // Force UI update by triggering objectWillChange
-            self.objectWillChange.send()
-            logger.info("UI update triggered, lastUpdated: \(self.lastUpdated?.description ?? "nil")")
+            logger.info("Data updated, lastUpdated: \(self.lastUpdated?.description ?? "nil")")
         }
     }
     

MacTorn/MacTorn/Views/ContentView.swift

@@ -91,7 +91,7 @@ struct ContentView: View {
     private var headerView: some View {
         HStack {
             if let lastUpdated = appState.lastUpdated {
-                Text("Updated: \(lastUpdated, formatter: timeFormatter)")
+                Text("Updated: \(lastUpdated, formatter: Self.timeFormatter)")
                     .font(.caption2)
                     .foregroundColor(.secondary)
             }
@@ -177,9 +177,9 @@ struct ContentView: View {
         .padding(.bottom, 8)
     }
     
-    private var timeFormatter: DateFormatter {
+    private static let timeFormatter: DateFormatter = {
         let formatter = DateFormatter()
         formatter.timeStyle = .short
         return formatter
-    }
+    }()
 }

MacTorn/MacTorn/Views/CreditsView.swift

@@ -5,7 +5,7 @@ struct CreditsView: View {
     @Binding var showCredits: Bool
 
     // MARK: - Developer
-    private let developer = TornContributor(name: "bombel", tornID: 2362436)
+    private let developer = TornContributor(name: "bombel", tornID: TornConstants.developerID)
 
     // MARK: - Special Thanks
     private let specialThanks: [TornContributor] = [
@@ -92,7 +92,9 @@ struct CreditsView: View {
             }
 
             Button {
-                openTornProfile(developer.tornID!)
+                if let tornID = developer.tornID {
+                    openTornProfile(tornID)
+                }
             } label: {
                 HStack {
                     Text(developer.name)

MacTorn/MacTorn/Views/SettingsView.swift

@@ -7,9 +7,9 @@ struct SettingsView: View {
     @AppStorage("preferredBrowser") private var preferredBrowser: String = PreferredBrowser.system.rawValue
     @State private var inputKey: String = ""
     @State private var showCredits: Bool = false
+    @State private var availableBrowsers: [PreferredBrowser] = PreferredBrowser.availableBrowsers()
 
-    // Developer ID for tip feature (bombel)
-    private let developerID = 2362436
+    private let developerID = TornConstants.developerID
 
     var body: some View {
         if showCredits {
@@ -73,7 +73,7 @@ struct SettingsView: View {
                         Text("2m").tag(120)
                     }
                     .pickerStyle(.segmented)
-                    .onChange(of: appState.refreshInterval) { _ in
+                    .onChange(of: appState.refreshInterval) {
                         Task { @MainActor in
                             appState.startPolling()
                         }
@@ -114,7 +114,7 @@ struct SettingsView: View {
                         .frame(width: 20)
 
                     Picker("Preferred Browser", selection: $preferredBrowser) {
-                        ForEach(PreferredBrowser.allCases) { browser in
+                        ForEach(availableBrowsers) { browser in
                             Text(browser.rawValue).tag(browser.rawValue)
                         }
                     }
@@ -230,6 +230,15 @@ struct SettingsView: View {
         .frame(width: 320)
         .onAppear {
             inputKey = appState.apiKey
+            refreshAvailableBrowsers()
+        }
+    }
+
+    private func refreshAvailableBrowsers() {
+        let browsers = PreferredBrowser.availableBrowsers()
+        availableBrowsers = browsers
+        if !browsers.contains(where: { $0.rawValue == preferredBrowser }) {
+            preferredBrowser = PreferredBrowser.system.rawValue
         }
     }
     

MacTorn/MacTornUITests/MacTornUITests.swift

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

README.md

@@ -16,6 +16,7 @@ A native macOS menu bar app for monitoring your **Torn** game status.
 ## Documentation
 
 For detailed documentation, visit the [MacTorn Wiki](https://github.com/pawelorzech/MacTorn/wiki).
+For community discussion and feedback, see the [Torn forums thread](https://www.torn.com/forums.php#/p=threads&f=67&t=16532308).
 
 ## Features