Merge pull request #353 from wakatime/main

Release v5.28.2

Author: alanhamlett

.github/workflows/on_push.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   test:
     name: Tests and Build
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       -
         name: Checkout
@@ -75,7 +75,7 @@ jobs:
   sign:
     name: Sign Apple app
     needs: [version]
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       -
         name: Checkout
@@ -210,7 +210,7 @@ jobs:
 
   release:
     name: Release
-    runs-on: macos-13
+    runs-on: macos-15
     needs: [version, sign, changelog]
     steps:
       -

CONTRIBUTING.md

@@ -28,7 +28,7 @@ Build with `Xcode` before creating any pull requests, or your PR won’t pass th
 
 To fix linter warning(s), run `swiftlint --fix`.
 
-## Branching Stratgegy
+## Branching Strategy
 
 We require specific branch name prefixes for PRs:
 

WakaTime/AppDelegate.swift

@@ -107,8 +107,27 @@ class AppDelegate: NSObject, NSApplicationDelegate, StatusBarDelegate, UNUserNot
     }
 
     @objc func dashboardClicked(_ sender: AnyObject) {
-        if let url = URL(string: "https://wakatime.com/") {
+        let defaultUrl = "https://wakatime.com/"
+
+        var url = ConfigFile.getSetting(section: "settings", key: "api_url") ?? defaultUrl
+        if url.isEmpty {
+            url = defaultUrl
+        }
+
+        url = url
+            .replacingOccurrences(of: "://api.", with: "://")
+            .replacingOccurrences(of: "/api/v1", with: "")
+            .replacingOccurrences(of: "^api\\.", with: "", options: .regularExpression)
+            .replacingOccurrences(of: "/api", with: "")
+
+        if let url = URL(string: url) {
             NSWorkspace.shared.open(url)
+        } else {
+            if url != defaultUrl {
+                if let url = URL(string: defaultUrl) {
+                    NSWorkspace.shared.open(url)
+                }
+            }
         }
     }
 

WakaTime/Helpers/MonitoringManager.swift

@@ -213,6 +213,8 @@ class MonitoringManager {
                 return extractPrefix(element.rawTitle, separator: " - ")
             case .imessage:
                 return extractPrefix(element.rawTitle, separator: " - ")
+            case .inkscape:
+                return extractPrefix(element.rawTitle)
             case .iterm2:
                 return extractPrefix(element.rawTitle, separator: " - ")
             case .linear:
@@ -261,8 +263,10 @@ class MonitoringManager {
     }
 
     static func category(for app: NSRunningApplication, _ element: AXUIElement) -> Category {
-        guard let monitoredApp = app.monitoredApp else {
-            guard let url = currentBrowserUrl(for: app, element) else { return .coding }
+        guard let monitoredApp = app.monitoredApp else { return .coding }
+
+        if isAppBrowser(app) {
+            guard let url = currentBrowserUrl(for: app, element) else { return .browsing }
             return category(from: url)
         }
 
@@ -297,6 +301,8 @@ class MonitoringManager {
                 return .codereviewing
             case .imessage:
                 return .communicating
+            case .inkscape:
+                return .designing
             case .iterm2:
                 return .coding
             case .linear:
@@ -453,6 +459,8 @@ class MonitoringManager {
                 }
             case .figma:
                 return "Image (svg)"
+            case .inkscape:
+                return "Image (svg)"
             case .postman:
                 return "HTTP Request"
             default:

WakaTime/Watchers/MonitoredApp.swift

@@ -18,6 +18,7 @@ enum MonitoredApp: String, CaseIterable {
     case firefox = "org.mozilla.firefox"
     case github = "com.github.GitHubClient"
     case imessage = "com.apple.MobileSMS"
+    case inkscape = "org.inkscape.Inkscape"
     case iterm2 = "com.googlecode.iterm2"
     case linear = "com.linear"
     case miro = "com.electron.realtimeboard"