Improves detection for Amazon devices

ref #7539
matomo-org · Dec 20, 2023 · 6b50197 · 6b50197
1 parent 860af1a
commit 6b50197
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/Tests/fixtures/tv-3.yml b/Tests/fixtures/tv-3.yml
@@ -301,3 +301,21 @@
     model: Fire TV Stick 4K Max (2023)
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 9; AFTANNA0 Build/PS7664.3772N; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/116.0.0.0 Mobile Safari/537.36
+  os:
+    name: Fire OS
+    version: "7"
+    platform: ""
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 116.0.0.0
+    engine: Blink
+    engine_version: 116.0.0.0
+  device:
+    type: tv
+    brand: Amazon
+    model: Fire TV (2021-2022)
+  os_family: Android
+  browser_family: Chrome
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -23104,43 +23104,46 @@ AmazonBasics:
 
 # Kindle
 Amazon:
-  regex: '(?:AFT[ABMNRST]|AFTSSS?|AFTK(?:A|RT)|SD4930UR|AEO(?:BC|C[HW]|KN)|KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|TRP?WI|SAW[IA]|GIWI|KAWI|MAWI|MEWI|MUWI|SUWI))(?:[);/ ]|$)|Kindle|AlexaMediaPlayer|Amazon (?:Tate|Jem)|Silk/\d+\.\d+|Echo/1|.+FIRETVSTICK'
+  regex: '(?:AFT[ABMNRST]|AFTSSS?|AFTANNA0|AFTK(?:A|RT)|SD4930UR|AEO(?:BC|C[HW]|KN)|KF(?:OT|ONWI|TT|JWI|JWA|[DFS]OWI|A[PRSU]WI|T[BH]WI|TRP?WI|SAW[IA]|GIWI|KAWI|MAWI|MEWI|MUWI|SUWI))(?:[);/ ]|$)|Kindle|AlexaMediaPlayer|Amazon (?:Tate|Jem)|Silk/\d+\.\d+|Echo/1|.+FIRETVSTICK'
   device: 'tablet'
   models:
-    - regex: 'AFTA'
+    - regex: 'AFTA(?:[);/ ]|$)'
       model: 'Fire TV Cube (Gen 1)'
       device: 'tv'
-    - regex: 'AFTR'
+    - regex: 'AFTR(?:[);/ ]|$)'
       model: 'Fire TV Cube (Gen 2)'
       device: 'tv'
-    - regex: 'AFTN'
+    - regex: 'AFTN(?:[);/ ]|$)'
       model: 'Fire TV (Gen 3)'
       device: 'tv'
     - regex: 'AFTTI43'
       model: 'Fire TV 4-Series (2021)'
       device: 'tv'
+    - regex: 'AFTANNA0(?:[);/ ]|$)'
+      model: 'Fire TV (2021-2022)'
+      device: 'tv'
     - regex: 'AFTB(?:[);/ ]|$)'
       model: 'Fire TV (Gen 1)'
       device: 'tv'
-    - regex: 'AFTSSS'
+    - regex: 'AFTSSS(?:[);/ ]|$)'
       model: 'Fire TV Stick (Gen 3)'
       device: 'tv'
-    - regex: 'AFTSS'
+    - regex: 'AFTSS(?:[);/ ]|$)'
       model: 'Fire TV Stick Lite (Gen 1)'
       device: 'tv'
-    - regex: 'AFTTIFF43'
+    - regex: 'AFTTIFF43(?:[);/ ]|$)'
       model: 'Fire TV Omni QLED (2022)'
       device: 'tv'
-    - regex: 'AFT[MST]'
+    - regex: 'AFT[MST](?:[);/ ]|$)'
       model: 'Fire TV Stick'
       device: 'tv'
     - regex: '.+FIRETVSTICK2018'
       model: 'Fire TV Stick 4K'
       device: 'tv'
-    - regex: 'AFTKA'
+    - regex: 'AFTKA(?:[);/ ]|$)'
       model: 'Fire TV Stick 4K Max' # 2021
       device: 'tv'
-    - regex: 'AFTKRT'
+    - regex: 'AFTKRT(?:[);/ ]|$)'
       model: 'Fire TV Stick 4K Max (2023)'
       device: 'tv'
     - regex: 'KFFOWI(?:[);/ ]|$)'