Detect apps: Be Focused, Focus Keeper, Focus Matrix (#6950)

* feat(app) detect apps: Be Focused, Focus Keeper, Focus Matrix feat(device) rename CPH2197 A94 5G to A74 5G feat(device) rename PCCM00 Reno 10X to Reno 10X Zoom issue #6948 * feat(bot) detect bots: Linespider, Cincraw Co-authored-by: Stefan Giehl <[email protected]>
matomo-org · Jan 4, 2022 · 886da61 · 886da61
1 parent 2468a97
commit 886da61
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 7 deletions.
diff --git a/Tests/Parser/Client/fixtures/mobile_app.yml b/Tests/Parser/Client/fixtures/mobile_app.yml
@@ -989,3 +989,21 @@
     type: mobile app
     name: Instabridge
     version: ""
+-
+  user_agent: Be Focused/104 CFNetwork/976 Darwin/18.2.0
+  client:
+    type: mobile app
+    name: Be Focused
+    version: ""
+-
+  user_agent: Focuskeeper/2.0.15.4 CFNetwork/1240.0.4 Darwin/20.5.0
+  client:
+    type: mobile app
+    name: Focus Keeper
+    version: 2.0.15.4
+-
+  user_agent: Focus Matrix/155 CFNetwork/976 Darwin/18.2.0
+  client:
+    type: mobile app
+    name: Focus Matrix
+    version: ""
diff --git a/Tests/fixtures/bots.yml b/Tests/fixtures/bots.yml
@@ -4447,3 +4447,15 @@
     producer:
       name: Facebook
       url: http://www.facebook.com
+-
+  user_agent: Mozilla/5.0 (compatible; Linespider/1.1; https://lin.ee/4dwXkTH)
+  bot:
+    name: Linespider
+    category: Crawler
+    url: https://lin.ee/4dwXkTH
+-
+  user_agent: Mozilla/5.0 (compatible; Cincraw/1.0; +http://cincrawdata.net/bot/)
+  bot:
+    name: Cincraw
+    category: Crawler
+    url: http://cincrawdata.net/bot/
diff --git a/Tests/fixtures/smartphone-11.yml b/Tests/fixtures/smartphone-11.yml
@@ -1028,7 +1028,7 @@
   device:
     type: smartphone
     brand: OPPO
-    model: Reno 10X
+    model: Reno 10X Zoom
   os_family: Android
   browser_family: Chrome
 -

diff --git a/Tests/fixtures/smartphone-25.yml b/Tests/fixtures/smartphone-25.yml
@@ -572,7 +572,7 @@
   device:
     type: smartphone
     brand: OPPO
-    model: A94 5G
+    model: A74 5G
   os_family: Android
   browser_family: Chrome
 -

diff --git a/regexes/bots.yml b/regexes/bots.yml
@@ -2576,7 +2576,6 @@
   category: 'Crawler'
   url: 'https://github.com/VIPnytt/SitemapParser/'
 
-
 - regex: '^Turnitin'
   name: 'Turnitin'
   category: 'Crawler'
@@ -2601,6 +2600,16 @@
   category: 'Service Agent'
   url: 'https://discordapp.com'
 
+- regex: 'Linespider/([\d+.]+)'
+  name: 'Linespider'
+  category: 'Crawler'
+  url: 'https://lin.ee/4dwXkTH'
+
+- regex: 'Cincraw/([\d+.]+)'
+  name: 'Cincraw'
+  category: 'Crawler'
+  url: 'http://cincrawdata.net/bot/'
+
 # Generic detections
 - regex: '[a-z0-9\-_]*((?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9])|crawler|crawl|checker|archiver|transcoder|spider)([^a-z]|$)'
   name: 'Generic Bot'
diff --git a/regexes/client/mobile_apps.yml b/regexes/client/mobile_apps.yml
@@ -986,3 +986,18 @@
 - regex: 'Instabridge'
   name: 'Instabridge'
   version: ''
+
+# Be Focused (https://apps.apple.com/app/id973130201)
+- regex: 'Be Focused/(\d+\.[\.\d]+)?'
+  name: 'Be Focused'
+  version: '$1'
+
+# Focus Matrix (https://apps.apple.com/app/id1087284172)
+- regex: 'Focus Matrix/(\d+\.[\.\d]+)?'
+  name: 'Focus Matrix'
+  version: '$1'
+
+# Focus Keeper (https://apps.apple.com/app/id867374917)
+- regex: 'Focuskeeper/(\d+\.[\.\d]+)?'
+  name: 'Focus Keeper'
+  version: '$1'
diff --git a/regexes/device/mobiles.yml b/regexes/device/mobiles.yml
@@ -13832,7 +13832,7 @@ OPPO:
     - regex: '(?:CPH2203)(?:[);/ ]|$)'
       model: 'A94'
     - regex: '(?:CPH2197)(?:[);/ ]|$)'
-      model: 'A94 5G'
+      model: 'A74 5G'
     - regex: 'PCE[TM]00(?:[);/ ]|$)'
       model: 'A9x'
     - regex: '(?:OPPO[ _]?)?CPH1851(?:[);/ ]|$)'
@@ -13977,9 +13977,7 @@ OPPO:
       model: 'Reno'
     - regex: 'CPH1983(?:[);/ ]|$)'
       model: 'Reno A'
-    - regex: 'PCCM00(?:[);/ ]|$)'
-      model: 'Reno 10X'
-    - regex: 'CPH1919(?:[);/ ]|$)'
+    - regex: '(?:CPH1919|PCCM00)(?:[);/ ]|$)'
       model: 'Reno 10X Zoom'
     - regex: '(?:PCKM00|CPH1907)(?:[);/ ]|$)'
       model: 'Reno 2'