Improves detection for Apple Watch

matomo-org · Oct 14, 2023 · 66438da · 66438da
1 parent 18522c9
commit 66438da
Show file tree

Hide file tree

Showing 2 changed files with 206 additions and 0 deletions.
diff --git a/Tests/fixtures/wearable.yml b/Tests/fixtures/wearable.yml
@@ -2040,3 +2040,185 @@
     model: "4"
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,9.0,20R361,Watch6,10]'
+  os:
+    name: watchOS
+    version: "9.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch SE (Gen 2) 40mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,9.0,20R361,Watch6,11]'
+  os:
+    name: watchOS
+    version: "9.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch SE (Gen 2) 44mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,9.1,20S75,Watch6,12]'
+  os:
+    name: watchOS
+    version: "9.1"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch SE (Gen 2) 40mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,9.1,20S75,Watch6,13]'
+  os:
+    name: watchOS
+    version: "9.1"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch SE (Gen 2) 44mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,9.1,20S75,Watch6,14]'
+  os:
+    name: watchOS
+    version: "9.1"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Series 8 41mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,9.0,20R361,Watch6,15]'
+  os:
+    name: watchOS
+    version: "9.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Series 8 45mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,9.4,20T253,Watch6,16]'
+  os:
+    name: watchOS
+    version: "9.4"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Series 8 41mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: aceApps (watchOS 9.0; Apple Watch6,17; naverapp_ios_watch; 11.17.2)
+  os:
+    name: watchOS
+    version: "9.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Series 8 45mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,9.3.1,20S664,Watch6,18]'
+  os:
+    name: watchOS
+    version: 9.3.1
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Ultra
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,10.0,21R355,Watch7,1]'
+  os:
+    name: watchOS
+    version: "10.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Series 9 41mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,10.0,21R355,Watch7,2]'
+  os:
+    name: watchOS
+    version: "10.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Series 9 45mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,10.0,21R355,Watch7,3]'
+  os:
+    name: watchOS
+    version: "10.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Series 9 41mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,10.0,21R355,Watch7,4]'
+  os:
+    name: watchOS
+    version: "10.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Series 9 45mm
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: 'com.apple.invitation-registration [Watch OS,10.0,21R355,Watch7,5]'
+  os:
+    name: watchOS
+    version: "10.0"
+    platform: ARM
+  client: null
+  device:
+    type: wearable
+    brand: Apple
+    model: Watch Ultra 2
+  os_family: iOS
+  browser_family: Unknown
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -933,6 +933,24 @@ Apple:
     - regex: 'Watch5,1[02]'
       device: 'wearable'
       model: 'Watch SE 44mm'
+    - regex: 'Watch6,1[02]'
+      device: 'wearable'
+      model: 'Watch SE (Gen 2) 40mm'
+    - regex: 'Watch6,1[13]'
+      device: 'wearable'
+      model: 'Watch SE (Gen 2) 44mm'
+    - regex: 'Watch6,1[46]'
+      device: 'wearable'
+      model: 'Watch Series 8 41mm'
+    - regex: 'Watch6,1[57]'
+      device: 'wearable'
+      model: 'Watch Series 8 45mm'
+    - regex: 'Watch6,18'
+      device: 'wearable'
+      model: 'Watch Ultra'
+    - regex: 'Watch7,5'
+      device: 'wearable'
+      model: 'Watch Ultra 2'
     - regex: 'Watch([456]),[13]'
       device: 'wearable'
       model: 'Watch Series $1 40mm'
@@ -945,6 +963,12 @@ Apple:
     - regex: 'Watch6,[79]'
       device: 'wearable'
       model: 'Watch Series 7 45mm'
+    - regex: 'Watch7,[13]'
+      device: 'wearable'
+      model: 'Watch Series 9 41mm'
+    - regex: 'Watch7,[24]'
+      device: 'wearable'
+      model: 'Watch Series 9 45mm'
     - regex: 'Watch'
       device: 'wearable'
       model: 'Watch'