From 9717465c48b92642de595b6aae2b264ccec00534 Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Tue, 7 Jan 2025 19:15:47 +0100 Subject: [PATCH 1/4] Add missing device flag (#7972) fixes #7971 --- regexes/device/televisions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/regexes/device/televisions.yml b/regexes/device/televisions.yml index 7f24772fdb..1e710bc310 100644 --- a/regexes/device/televisions.yml +++ b/regexes/device/televisions.yml @@ -1253,6 +1253,7 @@ Xiaomi: # Unknown Unknown: regex: 'OEM, ([a-z0-9_ -]+), (?:wired|wireless)|_TV_[A-Z0-9]+_([0-9]{4});|LaTivu_(?:\d+[.\d]+)_([0-9]{4})' + device: 'tv' models: - regex: '_TV_[A-Z0-9]+_([0-9]{4});' model: 'Smart TV ($1)' From 6a21bb08ff84b77df10f85ddeb7899e33e7aa68c Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Tue, 7 Jan 2025 22:55:39 +0100 Subject: [PATCH 2/4] Fix badges (#7973) --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 608dea2876..335427b879 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ DeviceDetector ## Code Status -![PHPUnit](https://github.com/matomo-org/device-detector/workflows/PHPUnit/badge.svg?branch=master) -![PHPStan](https://github.com/matomo-org/device-detector/workflows/PHPStan%20check/badge.svg?branch=master) -![PHPCS](https://github.com/matomo-org/device-detector/workflows/PHPCS%20check/badge.svg?branch=master) -![YAML Lint](https://github.com/matomo-org/device-detector/workflows/YAML%20Lint/badge.svg?branch=master) -[![Validate regular Expressions](https://github.com/matomo-org/device-detector/actions/workflows/regular_expressions.yml/badge.svg)](https://github.com/matomo-org/device-detector/actions/workflows/regular_expressions.yml) +[![PHPUnit](https://github.com/matomo-org/device-detector/actions/workflows/phpunit.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/phpunit.yml?branch=master "PHPUnit") +[![PHPStan](https://github.com/matomo-org/device-detector/actions/workflows/phpstan.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/phpstan.yml?branch=master "PHPStan") +[![PHPCS](https://github.com/matomo-org/device-detector/actions/workflows/phpcs.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/phpcs.yml?branch=master "PHPCS") +[![YAML Lint](https://github.com/matomo-org/device-detector/actions/workflows/yamllint.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/yamllint.yml?branch=master "YAML Lint") +[![Validate regular Expressions](https://github.com/matomo-org/device-detector/actions/workflows/regular_expressions.yml/badge.svg?branch=master)](https://github.com/matomo-org/device-detector/actions/workflows/regular_expressions.yml?branch=master "Validate regular Expressions") [![Average time to resolve an issue](https://www.isitmaintained.com/badge/resolution/matomo-org/device-detector.svg)](https://www.isitmaintained.com/project/matomo-org/device-detector "Average time to resolve an issue") [![Percentage of issues still open](https://www.isitmaintained.com/badge/open/matomo-org/device-detector.svg)](https://www.isitmaintained.com/project/matomo-org/device-detector "Percentage of issues still open") From 091821e542302e9d4bdaee4318b0002b1a17dc4e Mon Sep 17 00:00:00 2001 From: virgileMaon Date: Wed, 8 Jan 2025 19:02:18 +0100 Subject: [PATCH 3/4] Adds detection for the HeartFocus Education for iOS (#7974) * Adds detection for the HFEducationIOS app * applies suggestions about the app name * add a comment with the link to the ios app --------- Co-authored-by: virgile dupuis --- Tests/Parser/Client/fixtures/mobile_app.yml | 6 ++++++ regexes/client/mobile_apps.yml | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/Tests/Parser/Client/fixtures/mobile_app.yml b/Tests/Parser/Client/fixtures/mobile_app.yml index d7a74946c3..7f4a4eeeb7 100644 --- a/Tests/Parser/Client/fixtures/mobile_app.yml +++ b/Tests/Parser/Client/fixtures/mobile_app.yml @@ -2315,3 +2315,9 @@ type: mobile app name: Edmodo version: 10.43.5 +- + user_agent: HFEducationIOS/1.0.6+g5a01fc39-dirty (iOS; 18.1.1; iPad13,18) + client: + type: mobile app + name: HeartFocus Education + version: 1.0.6 diff --git a/regexes/client/mobile_apps.yml b/regexes/client/mobile_apps.yml index a9781c5b97..f171318f40 100644 --- a/regexes/client/mobile_apps.yml +++ b/regexes/client/mobile_apps.yml @@ -2628,6 +2628,11 @@ name: 'Edmodo' version: '$1' +# HeartFocus Education (https://apps.apple.com/us/app/heartfocus-education/id6618151502) +- regex: 'HFEducationIOS/([\d.]+)' + name: 'HeartFocus Education' + version: '$1' + # Electron generic apps - regex: ' (?!(?:AppleWebKit|brave|Cypress|Franz|Mailspring|Notion|Basecamp|Evernote|catalyst|ramboxpro|BlueMail|BeakerBrowser|Dezor|TweakStyle|Colibri|Polypane|Singlebox|Skye|VibeMate|(?:d|LT|Glass|Sushi|Flash|OhHai)Browser|Sizzy))([a-z0-9]*)(?:-desktop|-electron-app)?/(\d+\.[\d.]+).*Electron/' name: '$1' From 074bf3003057eb774cc11f6cafeb7e40b624f7b3 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Wed, 8 Jan 2025 22:42:36 +0100 Subject: [PATCH 4/4] Improves version detection for iOS and macOS (#7968) --- Tests/Parser/fixtures/oss.yml | 8 ++++++++ regexes/oss.yml | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml index adeb002575..d0c03bea04 100644 --- a/Tests/Parser/fixtures/oss.yml +++ b/Tests/Parser/fixtures/oss.yml @@ -5869,3 +5869,11 @@ version: "5" platform: "" family: Android +- + user_agent: ArcMobile2/56955.2 CFNetwork/3826.400.101 Darwin/24.3.0 + os: + name: iOS + short_name: IOS + version: "18.3" + platform: "" + family: iOS diff --git a/regexes/oss.yml b/regexes/oss.yml index 46af8a8c5b..9751e52966 100644 --- a/regexes/oss.yml +++ b/regexes/oss.yml @@ -1360,6 +1360,8 @@ - regex: '^(?!com\.apple\.Safari\.SearchHelper|Safari).*(?:CFNetwork|Mana)/.+ Darwin/(\d+[.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))' name: 'iOS' versions: + - regex: 'Darwin/24\.3\.0' + version: '18.3' - regex: 'Darwin/24\.2\.0' version: '18.2' - regex: 'Darwin/24\.1\.0' @@ -1591,6 +1593,8 @@ - regex: '(?:CFNetwork|Mana|StudioDisplay)/.+Darwin(?:/|; )(?:[\d.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d.]+)|C?Python.*Darwin|PowerMac|com\.apple\.Safari\.SearchHelper|^Safari' name: 'Mac' versions: + - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.3\.0' + version: '15.3' - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.2\.0' version: '15.2' - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.1\.0'