Compare commits

..

No commits in common. "main" and "v1.4.7" have entirely different histories.
main ... v1.4.7

26 changed files with 49 additions and 328 deletions

View file

@ -1,44 +0,0 @@
name: Claude Code Review
on:
pull_request:
types: [opened, synchronize, ready_for_review, reopened]
# Optional: Only run on specific file changes
# paths:
# - "src/**/*.ts"
# - "src/**/*.tsx"
# - "src/**/*.js"
# - "src/**/*.jsx"
jobs:
claude-review:
# Optional: Filter by PR author
# if: |
# github.event.pull_request.user.login == 'external-contributor' ||
# github.event.pull_request.user.login == 'new-developer' ||
# github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: read
issues: read
id-token: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Run Claude Code Review
id: claude-review
uses: anthropics/claude-code-action@v1
with:
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
plugins: 'code-review@claude-code-plugins'
prompt: '/code-review:code-review ${{ github.repository }}/pull/${{ github.event.pull_request.number }}'
# See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
# or https://code.claude.com/docs/en/cli-reference for available options

View file

@ -1,50 +0,0 @@
name: Claude Code
on:
issue_comment:
types: [created]
pull_request_review_comment:
types: [created]
issues:
types: [opened, assigned]
pull_request_review:
types: [submitted]
jobs:
claude:
if: |
(github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
(github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
(github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
(github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: read
issues: read
id-token: write
actions: read # Required for Claude to read CI results on PRs
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Run Claude Code
id: claude
uses: anthropics/claude-code-action@v1
with:
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
# This is an optional setting that allows Claude to read CI results on PRs
additional_permissions: |
actions: read
# Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
# prompt: 'Update the pull request description to include a summary of changes.'
# Optional: Add claude_args to customize behavior and configuration
# See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
# or https://code.claude.com/docs/en/cli-reference for available options
# claude_args: '--allowed-tools Bash(gh pr:*)'

View file

@ -5,21 +5,6 @@ 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/), 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). 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
- Preferred browser support for opening Torn links (system default browser selection)
- GitHub Actions integration with Claude Code for automated PR assistance and code review
- BrowserManager utility for managing browser preferences across the app
### Changed
- Improved link handling to respect user's default browser choice
## [1.4.7] - 2026-01-27 ## [1.4.7] - 2026-01-27
### Added ### Added

BIN
MacTorn-v1.4.4.zip Normal file

Binary file not shown.

BIN
MacTorn-v1.4.5.zip Normal file

Binary file not shown.

BIN
MacTorn-v1.4.6.zip Normal file

Binary file not shown.

View file

@ -32,7 +32,6 @@
AAA00023 /* CreditsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA10024 /* CreditsView.swift */; }; AAA00023 /* CreditsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA10024 /* CreditsView.swift */; };
AAA00024 /* TransparencyEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA10025 /* TransparencyEnvironment.swift */; }; AAA00024 /* TransparencyEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA10025 /* TransparencyEnvironment.swift */; };
AAA00025 /* FeedbackPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA10026 /* FeedbackPromptView.swift */; }; AAA00025 /* FeedbackPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA10026 /* FeedbackPromptView.swift */; };
AAA00026 /* BrowserManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA10027 /* BrowserManager.swift */; };
/* Unit Tests */ /* Unit Tests */
BBB00001 /* MockNetworkSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB10001 /* MockNetworkSession.swift */; }; BBB00001 /* MockNetworkSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB10001 /* MockNetworkSession.swift */; };
BBB00002 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB10002 /* TestHelpers.swift */; }; BBB00002 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB10002 /* TestHelpers.swift */; };
@ -95,7 +94,6 @@
AAA10024 /* CreditsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditsView.swift; sourceTree = "<group>"; }; AAA10024 /* CreditsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditsView.swift; sourceTree = "<group>"; };
AAA10025 /* TransparencyEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransparencyEnvironment.swift; sourceTree = "<group>"; }; AAA10025 /* TransparencyEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransparencyEnvironment.swift; sourceTree = "<group>"; };
AAA10026 /* FeedbackPromptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackPromptView.swift; sourceTree = "<group>"; }; AAA10026 /* FeedbackPromptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackPromptView.swift; sourceTree = "<group>"; };
AAA10027 /* BrowserManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserManager.swift; sourceTree = "<group>"; };
AAA10000 /* MacTorn.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacTorn.app; sourceTree = BUILT_PRODUCTS_DIR; }; AAA10000 /* MacTorn.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacTorn.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* Unit Test Files */ /* Unit Test Files */
BBB10001 /* MockNetworkSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockNetworkSession.swift; sourceTree = "<group>"; }; BBB10001 /* MockNetworkSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockNetworkSession.swift; sourceTree = "<group>"; };
@ -228,7 +226,6 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
AAA10009 /* NotificationManager.swift */, AAA10009 /* NotificationManager.swift */,
AAA10027 /* BrowserManager.swift */,
AAA10011 /* LaunchAtLoginManager.swift */, AAA10011 /* LaunchAtLoginManager.swift */,
AAA10012 /* ShortcutsManager.swift */, AAA10012 /* ShortcutsManager.swift */,
AAA10016 /* SoundManager.swift */, AAA10016 /* SoundManager.swift */,
@ -467,7 +464,6 @@
AAA00023 /* CreditsView.swift in Sources */, AAA00023 /* CreditsView.swift in Sources */,
AAA00024 /* TransparencyEnvironment.swift in Sources */, AAA00024 /* TransparencyEnvironment.swift in Sources */,
AAA00025 /* FeedbackPromptView.swift in Sources */, AAA00025 /* FeedbackPromptView.swift in Sources */,
AAA00026 /* BrowserManager.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -651,7 +647,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MARKETING_VERSION = 1.5.1; MARKETING_VERSION = 1.4.7;
PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.app; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.app;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -678,7 +674,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MARKETING_VERSION = 1.5.1; MARKETING_VERSION = 1.4.7;
PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.app; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.app;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -696,7 +692,7 @@
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.5.1; MARKETING_VERSION = 1.4.7;
PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornTests; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_EMIT_LOC_STRINGS = NO;
@ -714,7 +710,7 @@
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.5.1; MARKETING_VERSION = 1.4.7;
PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornTests; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_EMIT_LOC_STRINGS = NO;
@ -732,7 +728,7 @@
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.5.1; MARKETING_VERSION = 1.4.7;
PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornUITests; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornUITests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_EMIT_LOC_STRINGS = NO;
@ -749,7 +745,7 @@
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.5.1; MARKETING_VERSION = 1.4.7;
PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornUITests; PRODUCT_BUNDLE_IDENTIFIER = com.mactorn.MacTornUITests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_EMIT_LOC_STRINGS = NO;

View file

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

View file

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

View file

@ -1,112 +0,0 @@
import AppKit
enum PreferredBrowser: String, CaseIterable, Identifiable {
case system = "System Default"
case safari = "Safari"
case chrome = "Google Chrome"
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 bundleIdentifiers: [String]? {
switch self {
case .system:
return nil
case .safari:
return ["com.apple.Safari"]
case .chrome:
return ["com.google.Chrome"]
case .firefox:
return ["org.mozilla.firefox"]
case .edge:
return ["com.microsoft.edgemac"]
case .brave:
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 {
self = .system
return
}
self = value
}
}
final class BrowserManager {
static let shared = BrowserManager()
private init() {}
func open(_ url: URL) {
guard let scheme = url.scheme,
["http", "https"].contains(scheme) else {
NSWorkspace.shared.open(url)
return
}
let preference = PreferredBrowser(storedValue: UserDefaults.standard.string(forKey: "preferredBrowser"))
guard let appURL = preference.installedApplicationURL else {
NSWorkspace.shared.open(url)
return
}
let configuration = NSWorkspace.OpenConfiguration()
NSWorkspace.shared.open([url], withApplicationAt: appURL, configuration: configuration, completionHandler: nil)
}
}

View file

@ -103,8 +103,14 @@ class NotificationManager: NSObject, UNUserNotificationCenterDelegate {
/// Cancel all travel-related notifications /// Cancel all travel-related notifications
func cancelTravelNotifications() { func cancelTravelNotifications() {
let identifiers = TravelNotificationSetting.defaults.map { "\($0.id)_alert" } let identifiers = [
"travel_2min_alert",
"travel_1min_alert",
"travel_30sec_alert",
"travel_10sec_alert"
]
UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: identifiers) UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: identifiers)
print("Cancelled travel notifications")
} }
/// Cancel a specific notification by identifier /// Cancel a specific notification by identifier
@ -121,7 +127,7 @@ class NotificationManager: NSObject, UNUserNotificationCenterDelegate {
) { ) {
let categoryIdentifier = response.notification.request.content.categoryIdentifier let categoryIdentifier = response.notification.request.content.categoryIdentifier
if let type = NotificationType(rawValue: categoryIdentifier) { if let type = NotificationType(rawValue: categoryIdentifier) {
BrowserManager.shared.open(type.url) NSWorkspace.shared.open(type.url)
} }
completionHandler() completionHandler()
} }

View file

@ -41,6 +41,6 @@ class ShortcutsManager: ObservableObject {
func openURL(_ urlString: String) { func openURL(_ urlString: String) {
guard let url = URL(string: urlString) else { return } guard let url = URL(string: urlString) else { return }
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }

View file

@ -312,9 +312,6 @@ 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)")
@ -584,7 +581,9 @@ class AppState: ObservableObject {
// Check if feedback prompt should be shown // Check if feedback prompt should be shown
self.checkFeedbackPrompt() self.checkFeedbackPrompt()
logger.info("Data updated, lastUpdated: \(self.lastUpdated?.description ?? "nil")") // Force UI update by triggering objectWillChange
self.objectWillChange.send()
logger.info("UI update triggered, lastUpdated: \(self.lastUpdated?.description ?? "nil")")
} }
} }
@ -771,7 +770,7 @@ class AppState: ObservableObject {
showFeedbackPrompt = false showFeedbackPrompt = false
saveFeedbackState() saveFeedbackState()
if let url = URL(string: "https://www.torn.com/forums.php#/p=threads&f=67&t=16532308") { if let url = URL(string: "https://www.torn.com/forums.php#/p=threads&f=67&t=16532308") {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
@ -780,7 +779,7 @@ class AppState: ObservableObject {
showFeedbackPrompt = false showFeedbackPrompt = false
saveFeedbackState() saveFeedbackState()
if let url = URL(string: "mailto:pawel@orzech.lol?subject=MacTorn%20Feedback") { if let url = URL(string: "mailto:pawel@orzech.lol?subject=MacTorn%20Feedback") {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }

View file

@ -58,7 +58,7 @@ struct AttacksView: View {
Button { Button {
if let opponentId = attack.opponentId(forUserId: userId), if let opponentId = attack.opponentId(forUserId: userId),
let url = URL(string: "https://www.torn.com/profiles.php?XID=\(opponentId)") { let url = URL(string: "https://www.torn.com/profiles.php?XID=\(opponentId)") {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} label: { } label: {
HStack(spacing: 6) { HStack(spacing: 6) {
@ -128,7 +128,7 @@ struct AttacksView: View {
private func openURL(_ urlString: String) { private func openURL(_ urlString: String) {
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
} }

View file

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

View file

@ -5,7 +5,7 @@ struct CreditsView: View {
@Binding var showCredits: Bool @Binding var showCredits: Bool
// MARK: - Developer // MARK: - Developer
private let developer = TornContributor(name: "bombel", tornID: TornConstants.developerID) private let developer = TornContributor(name: "bombel", tornID: 2362436)
// MARK: - Special Thanks // MARK: - Special Thanks
private let specialThanks: [TornContributor] = [ private let specialThanks: [TornContributor] = [
@ -92,9 +92,7 @@ struct CreditsView: View {
} }
Button { Button {
if let tornID = developer.tornID { openTornProfile(developer.tornID!)
openTornProfile(tornID)
}
} label: { } label: {
HStack { HStack {
Text(developer.name) Text(developer.name)
@ -240,21 +238,21 @@ struct CreditsView: View {
private func openTornProfile(_ tornID: Int) { private func openTornProfile(_ tornID: Int) {
let urlString = "https://www.torn.com/profiles.php?XID=\(tornID)" let urlString = "https://www.torn.com/profiles.php?XID=\(tornID)"
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
private func openFaction(_ factionID: Int) { private func openFaction(_ factionID: Int) {
let urlString = "https://www.torn.com/factions.php?step=profile&ID=\(factionID)" let urlString = "https://www.torn.com/factions.php?step=profile&ID=\(factionID)"
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
private func openCompany(_ ownerID: Int) { private func openCompany(_ ownerID: Int) {
let urlString = "https://www.torn.com/joblist.php#/p=corpinfo&userID=\(ownerID)" let urlString = "https://www.torn.com/joblist.php#/p=corpinfo&userID=\(ownerID)"
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
} }

View file

@ -132,7 +132,7 @@ struct FactionView: View {
private func openURL(_ urlString: String) { private func openURL(_ urlString: String) {
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
} }

View file

@ -106,7 +106,7 @@ struct MoneyView: View {
private func openURL(_ urlString: String) { private func openURL(_ urlString: String) {
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
} }

View file

@ -52,7 +52,7 @@ struct PropertiesView: View {
private func openURL(_ urlString: String) { private func openURL(_ urlString: String) {
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
} }

View file

@ -4,12 +4,11 @@ struct SettingsView: View {
@EnvironmentObject var appState: AppState @EnvironmentObject var appState: AppState
@AppStorage("appearanceMode") private var appearanceMode: String = AppearanceMode.system.rawValue @AppStorage("appearanceMode") private var appearanceMode: String = AppearanceMode.system.rawValue
@AppStorage("reduceTransparency") private var reduceTransparency: Bool = false @AppStorage("reduceTransparency") private var reduceTransparency: Bool = false
@AppStorage("preferredBrowser") private var preferredBrowser: String = PreferredBrowser.system.rawValue
@State private var inputKey: String = "" @State private var inputKey: String = ""
@State private var showCredits: Bool = false @State private var showCredits: Bool = false
@State private var availableBrowsers: [PreferredBrowser] = PreferredBrowser.availableBrowsers()
private let developerID = TornConstants.developerID // Developer ID for tip feature (bombel)
private let developerID = 2362436
var body: some View { var body: some View {
if showCredits { if showCredits {
@ -73,7 +72,7 @@ struct SettingsView: View {
Text("2m").tag(120) Text("2m").tag(120)
} }
.pickerStyle(.segmented) .pickerStyle(.segmented)
.onChange(of: appState.refreshInterval) { .onChange(of: appState.refreshInterval) { _ in
Task { @MainActor in Task { @MainActor in
appState.startPolling() appState.startPolling()
} }
@ -107,20 +106,6 @@ struct SettingsView: View {
.labelsHidden() .labelsHidden()
} }
// Preferred Browser
HStack {
Image(systemName: "globe")
.foregroundColor(.secondary)
.frame(width: 20)
Picker("Preferred Browser", selection: $preferredBrowser) {
ForEach(availableBrowsers) { browser in
Text(browser.rawValue).tag(browser.rawValue)
}
}
.pickerStyle(.menu)
}
// Reduce Transparency (Accessibility) // Reduce Transparency (Accessibility)
HStack { HStack {
Image(systemName: "eye") Image(systemName: "eye")
@ -179,7 +164,7 @@ struct SettingsView: View {
Button("Download Update") { Button("Download Update") {
if let url = URL(string: update.htmlUrl) { if let url = URL(string: update.htmlUrl) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
.buttonStyle(.borderedProminent) .buttonStyle(.borderedProminent)
@ -230,15 +215,6 @@ struct SettingsView: View {
.frame(width: 320) .frame(width: 320)
.onAppear { .onAppear {
inputKey = appState.apiKey inputKey = appState.apiKey
refreshAvailableBrowsers()
}
}
private func refreshAvailableBrowsers() {
let browsers = PreferredBrowser.availableBrowsers()
availableBrowsers = browsers
if !browsers.contains(where: { $0.rawValue == preferredBrowser }) {
preferredBrowser = PreferredBrowser.system.rawValue
} }
} }
@ -292,7 +268,7 @@ struct SettingsView: View {
private func openTornProfile() { private func openTornProfile() {
let url = "https://www.torn.com/profiles.php?XID=\(developerID)" let url = "https://www.torn.com/profiles.php?XID=\(developerID)"
if let url = URL(string: url) { if let url = URL(string: url) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
} }

View file

@ -99,7 +99,7 @@ struct StatusView: View {
private var messagesBadge: some View { private var messagesBadge: some View {
Button { Button {
if let url = URL(string: "https://www.torn.com/messages.php") { if let url = URL(string: "https://www.torn.com/messages.php") {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} label: { } label: {
HStack { HStack {

View file

@ -149,7 +149,7 @@ struct TravelView: View {
Button { Button {
if let url = URL(string: "https://www.torn.com/travelagency.php") { if let url = URL(string: "https://www.torn.com/travelagency.php") {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} label: { } label: {
HStack { HStack {
@ -204,7 +204,7 @@ struct TravelView: View {
// Show only return button when abroad // Show only return button when abroad
Button { Button {
if let url = URL(string: "https://www.torn.com/travelagency.php") { if let url = URL(string: "https://www.torn.com/travelagency.php") {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} label: { } label: {
HStack { HStack {
@ -234,7 +234,7 @@ struct TravelView: View {
private func destinationButton(_ destination: TornDestination) -> some View { private func destinationButton(_ destination: TornDestination) -> some View {
Button { Button {
BrowserManager.shared.open(destination.travelAgencyURL) NSWorkspace.shared.open(destination.travelAgencyURL)
} label: { } label: {
VStack(spacing: 4) { VStack(spacing: 4) {
HStack(spacing: 4) { HStack(spacing: 4) {
@ -304,7 +304,7 @@ struct TravelView: View {
HStack(spacing: 8) { HStack(spacing: 8) {
Button { Button {
if let url = URL(string: "https://www.torn.com/travelagency.php") { if let url = URL(string: "https://www.torn.com/travelagency.php") {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} label: { } label: {
HStack { HStack {
@ -321,7 +321,7 @@ struct TravelView: View {
Button { Button {
if let url = URL(string: "https://www.torn.com/page.php?sid=ItemMarket") { if let url = URL(string: "https://www.torn.com/page.php?sid=ItemMarket") {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} label: { } label: {
HStack { HStack {

View file

@ -126,7 +126,7 @@ struct WatchlistView: View {
private func openURL(_ urlString: String) { private func openURL(_ urlString: String) {
if let url = URL(string: urlString) { if let url = URL(string: urlString) {
BrowserManager.shared.open(url) NSWorkspace.shared.open(url)
} }
} }
} }

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 appear within the given timeout /// Wait for element to exist with timeout
func waitForAppearance(timeout: TimeInterval = 5) -> Bool { func waitForExistence(timeout: TimeInterval = 5) -> Bool {
return self.waitForExistence(timeout: timeout) return self.waitForExistence(timeout: timeout)
} }

View file

@ -16,7 +16,6 @@ A native macOS menu bar app for monitoring your **Torn** game status.
## Documentation ## Documentation
For detailed documentation, visit the [MacTorn Wiki](https://github.com/pawelorzech/MacTorn/wiki). 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 ## Features