From c3919e52d29345eedf5d18babd00da230f64ecdc Mon Sep 17 00:00:00 2001 From: valvin Date: Sat, 18 Jan 2020 13:47:20 +0100 Subject: [PATCH 1/2] feat(blockbot): ensure good agent are whitelisted and add uptimerobot --- blockbot/blockbot.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php index 2714e494e..5f6d0cb02 100644 --- a/blockbot/blockbot.php +++ b/blockbot/blockbot.php @@ -55,7 +55,7 @@ function blockbot_init_1(App $a) { // List of "good" crawlers $good_agents = ['fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0', - 'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot']; + 'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/']; // List of known crawlers. $agents = ['SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/', @@ -80,6 +80,13 @@ function blockbot_init_1(App $a) { if (!Config::get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); } + else{ + foreach($good_agents as $good_agent){ + if (stristr($_SERVER['HTTP_USER_AGENT'], $good_agent)) { + return; + } + } + } if (Config::get('blockbot', 'block_gab')) { $agents[] = 'GabSocial/'; From e7f7868c88c48617b53d4bd70dc009684e4a264b Mon Sep 17 00:00:00 2001 From: valvin Date: Sat, 18 Jan 2020 23:28:14 +0100 Subject: [PATCH 2/2] fix(blockbot): indent code using psr12 --- blockbot/blockbot.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php index 5f6d0cb02..8a27f402b 100644 --- a/blockbot/blockbot.php +++ b/blockbot/blockbot.php @@ -79,9 +79,8 @@ function blockbot_init_1(App $a) { if (!Config::get('blockbot', 'good_crawlers')) { $agents = array_merge($agents, $good_agents); - } - else{ - foreach($good_agents as $good_agent){ + } else { + foreach ($good_agents as $good_agent) { if (stristr($_SERVER['HTTP_USER_AGENT'], $good_agent)) { return; }