Skip to content

fix: match Zen browser in Firefox web watcher buckets #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pelevin-d-y wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: match Zen browser in Firefox web watcher buckets #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,9 @@ function browsersWithBuckets(browserbuckets: string[]): [string, string][] {
// See: test/unit/queries.test.node.ts, https://github.com/ActivityWatch/aw-webui/issues/749
export const browser_appname_regex: Record<string, string> = {
chrome: '(?i)^(google[-_ ]?chrome|chrome|chromium)',
firefox: '(?i)(firefox|librewolf|waterfox|nightly)',
// Zen Browser installs the Firefox WebExtension build and can report into
// aw-watcher-web-firefox buckets, so match it as Firefox-compatible too.
firefox: '(?i)(firefox|librewolf|waterfox|nightly|zen)',
opera: '(?i)(opera)',
brave: '(?i)(brave)',
edge: '(?i)^(microsoft[-_ ]?edge|msedge)',
Expand Down
6 changes: 6 additions & 0 deletions test/unit/queries.test.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@ describe('browser_appname_regex', () => {
}
});

test('firefox pattern matches Zen when it reports to a Firefox web watcher bucket', () => {
const re = toRegex(browser_appname_regex.firefox);
expect(re.test('Zen')).toBe(true);
expect(re.test('Zen Browser')).toBe(true);
});

test('opera pattern matches all known Opera app names', () => {
const re = toRegex(browser_appname_regex.opera);
const knownNames = ['opera.exe', 'Opera.exe', 'Opera'];
Expand Down