From 8bb486d0714aeb3c0e13c6d5f3577c691f43bb5d Mon Sep 17 00:00:00 2001
From: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Date: Tue, 11 Jun 2024 13:39:45 +0200
Subject: [PATCH 1/3] Remove default engine for Phoenix Browser

---
 Tests/Parser/Client/fixtures/browser.yml | 9 +++++++++
 regexes/client/browsers.yml              | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
index 042564e4c4..c279adeb1e 100644
--- a/Tests/Parser/Client/fixtures/browser.yml
+++ b/Tests/Parser/Client/fixtures/browser.yml
@@ -9433,3 +9433,12 @@
     engine: ""
     engine_version: ""
     family: ""
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 12_5_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) PHX/13.3
+  client:
+    type: browser
+    name: Phoenix Browser
+    version: "13.3"
+    engine: WebKit
+    engine_version: 605.1.15
+    family: Chrome
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
index 2b0096aa9c..87350af944 100644
--- a/regexes/client/browsers.yml
+++ b/regexes/client/browsers.yml
@@ -1078,8 +1078,6 @@
 - regex: 'PHX/(?:(\d+[\.\d]+))?'
   name: 'Phoenix Browser'
   version: '$1'
-  engine:
-    default: 'Blink'
 
 # PrivacyWall (https://play.google.com/store/apps/details?id=org.privacywall.browser)
 - regex: 'PrivacyWall/(?:(\d+[\.\d]+))?'

From f0544d51073114ae9f888dafeed1c7f373af2c3b Mon Sep 17 00:00:00 2001
From: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Date: Tue, 11 Jun 2024 14:10:36 +0200
Subject: [PATCH 2/3] Remove default engine for DuckDuckGo Privacy Browser

---
 Tests/Parser/Client/fixtures/browser.yml | 9 +++++++++
 regexes/client/browsers.yml              | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
index c279adeb1e..e5e427df2c 100644
--- a/Tests/Parser/Client/fixtures/browser.yml
+++ b/Tests/Parser/Client/fixtures/browser.yml
@@ -9442,3 +9442,12 @@
     engine: WebKit
     engine_version: 605.1.15
     family: Chrome
+-
+  user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 DuckDuckGo/7 Safari/605.1.15
+  client:
+    type: browser
+    name: DuckDuckGo Privacy Browser
+    version: "7"
+    engine: WebKit
+    engine_version: 605.1.15
+    family: Chrome
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
index 87350af944..52fc79f8ef 100644
--- a/regexes/client/browsers.yml
+++ b/regexes/client/browsers.yml
@@ -2377,7 +2377,11 @@
     versions:
       28: 'Blink'
 
-- regex: '(?:DDG-Android-|DuckDuckGo/|ddg_android/)(\d+[\.\d]*)'
+# DuckDuckGo Privacy Browser
+- regex: 'DuckDuckGo/(\d+[\.\d]*)'
+  name: 'DuckDuckGo Privacy Browser'
+  version: '$1'
+- regex: '(?:DDG-Android-|ddg_android/)(\d+[\.\d]*)'
   name: 'DuckDuckGo Privacy Browser'
   version: '$1'
   engine:

From 74fe2dbf56a87f6e48b3f1a656eb146e6e2ef5db Mon Sep 17 00:00:00 2001
From: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Date: Tue, 11 Jun 2024 15:24:39 +0200
Subject: [PATCH 3/3] Improve regex for Yandex Browser

---
 Tests/Parser/Client/fixtures/browser.yml | 9 +++++++++
 regexes/client/browsers.yml              | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
index e5e427df2c..cd4408ad96 100644
--- a/Tests/Parser/Client/fixtures/browser.yml
+++ b/Tests/Parser/Client/fixtures/browser.yml
@@ -9451,3 +9451,12 @@
     engine: WebKit
     engine_version: 605.1.15
     family: Chrome
+-
+  user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 YaBrowser/24.4.5.383.10 SA/3 Mobile/15E148 Safari/604.1
+  client:
+    type: browser
+    name: Yandex Browser
+    version: 24.4.5.383.10
+    engine: WebKit
+    engine_version: 605.1.15
+    family: ""
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
index 52fc79f8ef..e75c90cecb 100644
--- a/regexes/client/browsers.yml
+++ b/regexes/client/browsers.yml
@@ -2203,7 +2203,7 @@
   version: '$1'
   engine:
     default: 'WebKit'
-- regex: 'iP(?:hone|ad);.+YaBrowser(?:/(\d+[\.\d]*)) Mobile'
+- regex: 'iP(?:hone|ad).*YaBrowser(?:/(\d+[\.\d]*))'
   name: 'Yandex Browser'
   version: '$1'
   engine: