Merge pull request #431 from JayBizzle/octopus_agent

JayBizzle · Nov 23, 2020 · 3efa286 · 3efa286
2 parents 6f3d35f + 719d5ae
commit 3efa286
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/raw/Exclusions.json b/raw/Exclusions.json
@@ -1 +1 @@
-["Safari.[\\d\\.]*","Firefox.[\\d\\.]*"," Chrome.[\\d\\.]*","Chromium.[\\d\\.]*","MSIE.[\\d\\.]","Opera\\\/[\\d\\.]*","Mozilla.[\\d\\.]*","AppleWebKit.[\\d\\.]*","Trident.[\\d\\.]*","Windows NT.[\\d\\.]*","Android [\\d\\.]*","Macintosh.","Ubuntu","Linux","[ ]Intel","Mac OS X [\\d_]*","(like )?Gecko(.[\\d\\.]*)?","KHTML,","CriOS.[\\d\\.]*","CPU iPhone OS ([0-9_])* like Mac OS X","CPU OS ([0-9_])* like Mac OS X","iPod","compatible","x86_..","i686","x64","X11","rv:[\\d\\.]*","Version.[\\d\\.]*","WOW64","Win64","Dalvik.[\\d\\.]*"," \\.NET CLR [\\d\\.]*","Presto.[\\d\\.]*","Media Center PC","BlackBerry","Build","Opera Mini\\\/\\d{1,2}\\.\\d{1,2}\\.[\\d\\.]*\\\/\\d{1,2}\\.","Opera"," \\.NET[\\d\\.]*","cubot","; M bot","; CRONO","; B bot","; IDbot","; ID bot","; POWER BOT"]
+["Safari.[\\d\\.]*","Firefox.[\\d\\.]*"," Chrome.[\\d\\.]*","Chromium.[\\d\\.]*","MSIE.[\\d\\.]","Opera\\\/[\\d\\.]*","Mozilla.[\\d\\.]*","AppleWebKit.[\\d\\.]*","Trident.[\\d\\.]*","Windows NT.[\\d\\.]*","Android [\\d\\.]*","Macintosh.","Ubuntu","Linux","[ ]Intel","Mac OS X [\\d_]*","(like )?Gecko(.[\\d\\.]*)?","KHTML,","CriOS.[\\d\\.]*","CPU iPhone OS ([0-9_])* like Mac OS X","CPU OS ([0-9_])* like Mac OS X","iPod","compatible","x86_..","i686","x64","X11","rv:[\\d\\.]*","Version.[\\d\\.]*","WOW64","Win64","Dalvik.[\\d\\.]*"," \\.NET CLR [\\d\\.]*","Presto.[\\d\\.]*","Media Center PC","BlackBerry","Build","Opera Mini\\\/\\d{1,2}\\.\\d{1,2}\\.[\\d\\.]*\\\/\\d{1,2}\\.","Opera"," \\.NET[\\d\\.]*","cubot","; M bot","; CRONO","; B bot","; IDbot","; ID bot","; POWER BOT","OCTOPUS-CORE"]
diff --git a/raw/Exclusions.txt b/raw/Exclusions.txt
@@ -44,4 +44,5 @@ cubot
 ; B bot
 ; IDbot
 ; ID bot
-; POWER BOT
+; POWER BOT
+OCTOPUS-CORE
diff --git a/src/Fixtures/Exclusions.php b/src/Fixtures/Exclusions.php
@@ -67,5 +67,6 @@ class Exclusions extends AbstractProvider
         '; IDbot',
         '; ID bot',
         '; POWER BOT',
+        'OCTOPUS-CORE',
     );
 }
diff --git a/tests/devices.txt b/tests/devices.txt
@@ -165633,4 +165633,5 @@ Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (K
 Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148/mdmzyvventykoptoospwivdhshkhvdyj
 Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148/mvmkbtaqqdhshwcbsygjnuqcqmpndbrt
 Mozilla/5.0 (Linux; Android 5.0; SM-N9100 Build/LRX21V) > AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 > Chrome/37.0.0.0 Mobile Safari/537.36 > MicroMessenger/6.0.2.56_r958800.520 NetType/WIFI
-Mozilla/5.0 (Linux; U; Android 5.0; en-US; SM-N900S;iPhone: Build/LRX21V)
+Mozilla/5.0 (Linux; U; Android 5.0; en-US; SM-N900S;iPhone: Build/LRX21V)
+Mozilla/5.0 (Linux; Android 9; OCTOPUS-CORE T8 Build/PPR1.181005.003) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36 YaApp_Android/9.50/apad YaSearchBrowser/9.50
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		["Safari.[\\d\\.]","Firefox.[\\d\\.]"," Chrome.[\\d\\.]","Chromium.[\\d\\.]","MSIE.[\\d\\.]","Opera\\\/[\\d\\.]","Mozilla.[\\d\\.]","AppleWebKit.[\\d\\.]","Trident.[\\d\\.]","Windows NT.[\\d\\.]","Android [\\d\\.]","Macintosh.","Ubuntu","Linux","[ ]Intel","Mac OS X [\\d_]","(like )?Gecko(.[\\d\\.])?","KHTML,","CriOS.[\\d\\.]","CPU iPhone OS ([0-9_]) like Mac OS X","CPU OS ([0-9_])* like Mac OS X","iPod","compatible","x86_..","i686","x64","X11","rv:[\\d\\.]","Version.[\\d\\.]","WOW64","Win64","Dalvik.[\\d\\.]"," \\.NET CLR [\\d\\.]","Presto.[\\d\\.]","Media Center PC","BlackBerry","Build","Opera Mini\\\/\\d{1,2}\\.\\d{1,2}\\.[\\d\\.]\\\/\\d{1,2}\\.","Opera"," \\.NET[\\d\\.]*","cubot","; M bot","; CRONO","; B bot","; IDbot","; ID bot","; POWER BOT"]
		["Safari.[\\d\\.]","Firefox.[\\d\\.]"," Chrome.[\\d\\.]","Chromium.[\\d\\.]","MSIE.[\\d\\.]","Opera\\\/[\\d\\.]","Mozilla.[\\d\\.]","AppleWebKit.[\\d\\.]","Trident.[\\d\\.]","Windows NT.[\\d\\.]","Android [\\d\\.]","Macintosh.","Ubuntu","Linux","[ ]Intel","Mac OS X [\\d_]","(like )?Gecko(.[\\d\\.])?","KHTML,","CriOS.[\\d\\.]","CPU iPhone OS ([0-9_]) like Mac OS X","CPU OS ([0-9_])* like Mac OS X","iPod","compatible","x86_..","i686","x64","X11","rv:[\\d\\.]","Version.[\\d\\.]","WOW64","Win64","Dalvik.[\\d\\.]"," \\.NET CLR [\\d\\.]","Presto.[\\d\\.]","Media Center PC","BlackBerry","Build","Opera Mini\\\/\\d{1,2}\\.\\d{1,2}\\.[\\d\\.]\\\/\\d{1,2}\\.","Opera"," \\.NET[\\d\\.]*","cubot","; M bot","; CRONO","; B bot","; IDbot","; ID bot","; POWER BOT","OCTOPUS-CORE"]