Merge pull request #237 from wakatime/feature/browser-activity-filter…

…-fixes Fix browser filter strings
wakatime · Mar 25, 2024 · bcd4bd0 · bcd4bd0
2 parents 1ded43b + f449dce
commit bcd4bd0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/WakaTime/Helpers/FilterManager.swift b/WakaTime/Helpers/FilterManager.swift
@@ -23,7 +23,7 @@ class FilterManager {
                     }
                 case .allowlist:
                     let addressMatchesAllowlist = patterns.contains { pattern in
-                        httpAddress.matchesRegex(pattern) || httpsAddress.matchesRegex(pattern)
+                        address.matchesRegex(pattern) || httpAddress.matchesRegex(pattern) || httpsAddress.matchesRegex(pattern)
                     }
                     // If none of the patterns on the allowlist match the given address, filter the site out
                     if !addressMatchesAllowlist {

diff --git a/WakaTime/Helpers/PropertiesManager.swift b/WakaTime/Helpers/PropertiesManager.swift
@@ -112,12 +112,14 @@ class PropertiesManager {
         get {
             guard let allowlist = UserDefaults.standard.string(forKey: Keys.allowlist.rawValue) else {
                 return
-                    "https://github.com/\n" +
-                    "https://gitlab.com/\n" +
-                    "https://stackoverflow.com/\n" +
-                    "https://docs.python.org/\n" +
-                    "https://google.com/\n" +
-                    "https://npmjs.com"
+                    "https?://(\\w\\.)*github\\.com/\n" +
+                    "https?://(\\w\\.)*gitlab\\.com/\n" +
+                    "^stackoverflow\\.com/\n" +
+                    "^docs\\.python\\.org/\n" +
+                    "https?://(\\w\\.)*golang\\.org/\n" +
+                    "https?://(\\w\\.)*go\\.dev/\n" +
+                    "https?://(\\w\\.)*npmjs\\.com/\n" +
+                    "https?//localhost[:\\d+]?/"
             }
 
             return allowlist

diff --git a/WakaTime/Views/SettingsView.swift b/WakaTime/Views/SettingsView.swift
@@ -55,7 +55,7 @@ class SettingsView: NSView, NSTextFieldDelegate, NSTextViewDelegate {
     // MARK: Denylist/Allowlist
 
     lazy var filterTypeLabel: NSTextField = {
-        NSTextField(labelWithString: "Logging Style:")
+        NSTextField(labelWithString: "Browser Filter:")
     }()
 
     lazy var filterSegmentedControl: NSSegmentedControl = {
@@ -230,11 +230,11 @@ class SettingsView: NSView, NSTextFieldDelegate, NSTextViewDelegate {
         let denylistTitle = "Denylist:"
         let denylistRemarks =
             "Sites that you don't want to show in your reports. " +
-            "One line per site."
+            "Only applicable to browsing activity. One regex per line."
         let allowlistTitle = "Allowlist:"
         let allowlistRemarks =
             "Sites that you want to show in your reports. " +
-            "One line per site."
+            "Only applicable to browsing activity. One regex per line."
 
         var title: String
         var remarks: String