Merge branch 'master' into devices

matomo-org · Nov 8, 2024 · c2198d3 · c2198d3
2 parents 00ca879 + aac3ddc
commit c2198d3
Show file tree

Hide file tree

Showing 7 changed files with 251 additions and 10 deletions.
diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -108,7 +108,7 @@ class Browser extends AbstractClientParser
         'AW' => 'Amiga Aweb',
         'PN' => 'APN Browser',
         '6A' => 'Arachne',
-        'RA' => 'Arc',
+        'RA' => 'Arc Search',
         'R5' => 'Armorfly Browser',
         'AI' => 'Arvin',
         'AK' => 'Ask.com',

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
@@ -7930,7 +7930,7 @@
   user_agent: ArcMobile2/1 CFNetwork/1494.0.5 Darwin/23.4.0
   client:
     type: browser
-    name: Arc
+    name: Arc Search
     version: ""
     engine: WebKit
     engine_version: ""
@@ -9435,7 +9435,7 @@
   user_agent: ArcMobile2/1.3.1; iPhone; iOS 16.1.1; Scale/2.00
   client:
     type: browser
-    name: Arc
+    name: Arc Search
     version: 1.3.1
     engine: WebKit
     engine_version: ""
@@ -10339,3 +10339,25 @@
     engine: Blink
     engine_version: 116.0.5845.190
     family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.60 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Arc Search
+    version: ""
+    engine: Blink
+    engine_version: 130.0.6723.60
+    family: Chrome
+  headers:
+    http-x-requested-with: company.thebrowser.arc
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Chrome Webview
+    version: ""
+    engine: Blink
+    engine_version: 123.0.0.0
+    family: Chrome
+  headers:
+    http-x-requested-with: com.android.webview
diff --git a/Tests/fixtures/clienthints.yml b/Tests/fixtures/clienthints.yml
@@ -3684,3 +3684,178 @@
     model: Galaxy A13
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Not_A Brand";v="8.0.0.0", "Chromium";v="120.0.6099.210", "Google Chrome";v="120.0.6099.210"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "120.0.6099.210"
+    Sec-CH-UA-Platform-Version: "11.0.0"
+    Sec-CH-UA-Model: "Model S 4G"
+  os:
+    name: Android
+    version: 11.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 120.0.6099.210
+    engine: Blink
+    engine_version: 120.0.6099.210
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model S 4G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="124.0.6367.113", "Google Chrome";v="124.0.6367.113", "Not-A.Brand";v="99.0.0.0"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "124.0.6367.113"
+    Sec-CH-UA-Platform-Version: "11.0.0"
+    Sec-CH-UA-Model: "Model S"
+  os:
+    name: Android
+    version: 11.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 124.0.6367.113
+    engine: Blink
+    engine_version: 124.0.6367.113
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model S
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; Model D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '" Not A;Brand";v="99.0.0.0", "Chromium";v="102.0.5005.125", "Google Chrome";v="102.0.5005.125"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "102.0.5005.125"
+    Sec-CH-UA-Platform-Version: "12.0.0"
+    Sec-CH-UA-Model: "Model D"
+  os:
+    name: Android
+    version: 12.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 102.0.5005.125
+    engine: Blink
+    engine_version: 102.0.5005.125
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model D
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; Model A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="104.0.5112.69", " Not A;Brand";v="99.0.0.0", "Google Chrome";v="104.0.5112.69"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "104.0.5112.69"
+    Sec-CH-UA-Platform-Version: "8.1.0"
+    Sec-CH-UA-Model: "Model A"
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 104.0.5112.69
+    engine: Blink
+    engine_version: 104.0.5112.69
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model A
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; Model 6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.85 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="94", "Google Chrome";v="94", ";Not A Brand";v="99"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "94.0.4606.85"
+    Sec-CH-UA-Platform-Version: "11.0.0"
+    Sec-CH-UA-Model: "Model 6"
+  os:
+    name: Android
+    version: 11.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 94.0.4606.85
+    engine: Blink
+    engine_version: 94.0.4606.85
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model 6
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="124.0.6367.82", "Google Chrome";v="124.0.6367.82", "Not-A.Brand";v="99.0.0.0"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "124.0.6367.82"
+    Sec-CH-UA-Platform-Version: "11.0.0"
+    Sec-CH-UA-Model: "Model_6_pro_4G"
+  os:
+    name: Android
+    version: 11.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 124.0.6367.82
+    engine: Blink
+    engine_version: 124.0.6367.82
+  device:
+    type: smartphone
+    brand: Sunmax
+    model: Model 6 Pro 4G
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36
+  headers:
+    Sec-CH-UA: '"Chromium";v="122.0.6261.90", "Not(A:Brand";v="24.0.0.0", "Google Chrome";v="122.0.6261.90"'
+    Sec-CH-UA-Platform: "Android"
+    Sec-CH-UA-Mobile: "?1"
+    Sec-CH-UA-Full-Version: "122.0.6261.90"
+    Sec-CH-UA-Platform-Version: "9.0.0"
+    Sec-CH-UA-Model: "LECT-TAB1011H"
+  os:
+    name: Android
+    version: 9.0.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 122.0.6261.90
+    engine: Blink
+    engine_version: 122.0.6261.90
+  device:
+    type: tablet
+    brand: Lectrus
+    model: LECT-TAB1011H
+  os_family: Android
+  browser_family: Chrome
diff --git a/Tests/fixtures/smartphone-18.yml b/Tests/fixtures/smartphone-18.yml
@@ -3669,3 +3669,39 @@
     model: SS5424G
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 8.1.0; MS571) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: 8.1.0
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 103.0.0.0
+    engine: Blink
+    engine_version: 103.0.0.0
+  device:
+    type: smartphone
+    brand: Maxcom
+    model: MS571
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; MS572) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36
+  os:
+    name: Android
+    version: "9"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Mobile
+    version: 108.0.0.0
+    engine: Blink
+    engine_version: 108.0.0.0
+  device:
+    type: smartphone
+    brand: Maxcom
+    model: MS572
+  os_family: Android
+  browser_family: Chrome
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
@@ -502,9 +502,9 @@
   engine:
     default: 'Blink'
 
-# Arc (https://arc.net/)
+# Arc Search (https://arc.net/ | https://arc.net/search)
 - regex: 'ArcMobile2(?:/(\d+\.[.\d]+);)?'
-  name: 'Arc'
+  name: 'Arc Search'
   version: '$1'
   engine:
     default: 'WebKit'

diff --git a/regexes/client/hints/browsers.yml b/regexes/client/hints/browsers.yml
@@ -322,3 +322,5 @@
 'com.hawk.android.browser': 'Hawk Turbo Browser'
 'com.zte.nubrowser': 'ZTE Browser'
 'com.cloaktp.browser': 'Privacy Pioneer Browser'
+'company.thebrowser.arc': 'Arc Search'
+'com.android.webview': 'Chrome Webview'
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -31924,14 +31924,14 @@ Ruggex:
 
 # Maxcom (maxcom.pl)
 Maxcom:
-  regex: '(?:MS(?:45[036]|505|507_STRONG|514|651)|MS457(?:PLUS)?|RS-401|Neva Rise S1)(?:[);/ ]|$)'
+  regex: '(?:MS(?:45[036]|505|507_STRONG|514|57[12]|651)|MS457(?:PLUS)?|RS-401|Neva Rise S1)(?:[);/ ]|$)'
   device: 'smartphone'
   models:
     - regex: '(MS457)PLUS(?:[);/ ]|$)'
       model: '$1 Plus'
     - regex: '(MS507)_STRONG(?:[);/ ]|$)'
       model: '$1 Strong'
-    - regex: 'MS(45[0367]|505|514|651)(?:[);/ ]|$)'
+    - regex: 'MS(45[0367]|505|514|57[12]|651)(?:[);/ ]|$)'
       model: 'MS$1'
     - regex: 'RS-401(?:[);/ ]|$)'
       model: 'RS-401'
@@ -40447,9 +40447,15 @@ Khadas:
 
 # Sunmax or sunmax mobile (sunmaxmobile.com)
 Sunmax:
-  regex: '(Model Y)(?:[);/ ]|$)'
+  regex: 'Model[ _][6ADSY](?:[ _]pro)?(?:[ _]4G)?(?:[);/ ]|$)'
   device: 'smartphone'
-  model: '$1'
+  models:
+    - regex: 'Model_6_pro_4G'
+      model: 'Model 6 Pro 4G'
+    - regex: '(Model S 4G)'
+      model: '$1'
+    - regex: '(Model [6ADSY])'
+      model: '$1'
 
 # Kapsys (kapsys.com)
 Kapsys:
@@ -40868,7 +40874,7 @@ BluSlate:
 
 # Lectrus
 Lectrus:
-  regex: 'LECT-TAB(1011|0711)(?:[);/ ]|$)'
+  regex: 'LECT-TAB(1011H?|0711)(?:[);/ ]|$)'
   device: 'tablet'
   model: 'LECT-TAB$1'