From c05e886ab5f456e8bfd17bd13c11b057eff36194 Mon Sep 17 00:00:00 2001 From: doggie Date: Mon, 5 Jun 2023 12:05:41 +0800 Subject: [PATCH 1/3] HTC Desire 22 pro Mozilla/5.0 (Linux; Android 12; HTC Desire 22 pro Build/SKQ1.220201.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.37 Mobile Safari/537.36 Instagram 277.0.0.0.79 Android (31/12; 480dpi; 1080x2132; HTC; HTC Desire 22 pro; htc_botdugls; qcom; zh_TW_#Hant; 460405333) --- raw/Exclusions.json | 2 +- raw/Exclusions.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/raw/Exclusions.json b/raw/Exclusions.json index 2f347bb..fa06ec1 100644 --- 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","OCTOPUS-CORE"] \ No newline at end of file +["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","htc_botdugls"] \ No newline at end of file diff --git a/raw/Exclusions.txt b/raw/Exclusions.txt index 9803f87..cacc4aa 100644 --- a/raw/Exclusions.txt +++ b/raw/Exclusions.txt @@ -45,4 +45,5 @@ cubot ; IDbot ; ID bot ; POWER BOT -OCTOPUS-CORE \ No newline at end of file +OCTOPUS-CORE +htc_botdugls \ No newline at end of file From 2dc46776e8bec001e5acf06d2a5e0d7dcf6efa2b Mon Sep 17 00:00:00 2001 From: doggie Date: Mon, 5 Jun 2023 13:01:53 +0800 Subject: [PATCH 2/3] HTC Desire 20+ (conflicted with the 008 crawler) Mozilla/5.0 (Linux; Android 10; HTC Desire 20+ Build/QKQ1.200706.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/85.0.4183.127 Mobile Safari/537.36; super/314014008/Android/29 [vmgApp] --- raw/Exclusions.json | 2 +- raw/Exclusions.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/raw/Exclusions.json b/raw/Exclusions.json index fa06ec1..e7e0141 100644 --- 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","OCTOPUS-CORE","htc_botdugls"] \ No newline at end of file +["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","htc_botdugls","super\\\/\\d+\\\/Android\\\/\\d+"] \ No newline at end of file diff --git a/raw/Exclusions.txt b/raw/Exclusions.txt index cacc4aa..a44a99c 100644 --- a/raw/Exclusions.txt +++ b/raw/Exclusions.txt @@ -46,4 +46,5 @@ cubot ; ID bot ; POWER BOT OCTOPUS-CORE -htc_botdugls \ No newline at end of file +htc_botdugls +super\/\d+\/Android\/\d+ \ No newline at end of file From 06a500bd37f15c8ab10e44dac90ffd240d0bda41 Mon Sep 17 00:00:00 2001 From: doggie Date: Mon, 5 Jun 2023 14:36:42 +0800 Subject: [PATCH 3/3] (1) HTC Desire 22 pro contains "htc_botdugls" that matches "bot" Mozilla/5.0 (Linux; Android 12; HTC Desire 22 pro Build/SKQ1.220201.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/112.0.5615.37 Mobile Safari/537.36 Instagram 277.0.0.0.79 Android (31/12; 480dpi; 1080x2132; HTC; HTC Desire 22 pro; htc_botdugls; qcom; zh_TW_#Hant; 460405333) (2) HTC Desire 20+ contains "super/314014008/Android/29" which m --- src/Fixtures/Exclusions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Fixtures/Exclusions.php b/src/Fixtures/Exclusions.php index 8b35791..6274557 100644 --- a/src/Fixtures/Exclusions.php +++ b/src/Fixtures/Exclusions.php @@ -68,5 +68,7 @@ class Exclusions extends AbstractProvider '; ID bot', '; POWER BOT', 'OCTOPUS-CORE', + 'htc_botdugls', + 'super\/\d+\/Android\/\d+', ); }