X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=blockbot%2Fblockbot.php;h=8c6560c014d5fbac57072e7b8f0d8ba65ba8420d;hb=c95713b19c35eff74052bf248bfc1025d5d9161b;hp=2c9b96184126f747108497a28e199422262c1ee7;hpb=3e512e3785ee27ff5f5be503e8d87dcd5370ed5e;p=friendica-addons.git

diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 2c9b9618..8c6560c0 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -9,13 +9,12 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\System;
+use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\L10n;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
@@ -32,18 +31,18 @@ function blockbot_addon_admin(&$a, &$o) {
 	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/blockbot/");
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => L10n::t('Save Settings'),
-		'$good_crawlers' => ['good_crawlers', L10n::t('Allow "good" crawlers'), Config::get('blockbot', 'good_crawlers'), "Don't block fediverse crawlers, relay servers and other bots with good purposes."],
-		'$block_gab' => ['block_gab', L10n::t('Block GabSocial'), Config::get('blockbot', 'block_gab'), 'Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.'],
-		'$training' => ['training', L10n::t('Training mode'), Config::get('blockbot', 'training'), "Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems."],
+		'$submit' => DI::l10n()->t('Save Settings'),
+		'$good_crawlers' => ['good_crawlers', DI::l10n()->t('Allow "good" crawlers'), DI::config()->get('blockbot', 'good_crawlers'), "Don't block fediverse crawlers, relay servers and other bots with good purposes."],
+		'$block_gab' => ['block_gab', DI::l10n()->t('Block GabSocial'), DI::config()->get('blockbot', 'block_gab'), 'Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.'],
+		'$training' => ['training', DI::l10n()->t('Training mode'), DI::config()->get('blockbot', 'training'), "Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems."],
 	]);
 }
 
 function blockbot_addon_admin_post(&$a) {
-	Config::set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
-	Config::set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
-	Config::set('blockbot', 'training', $_POST['training'] ?? false);
-	info(L10n::t('Settings updated.'). EOL);
+	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
+	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
+	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
+	info(DI::l10n()->t('Settings updated.'). EOL);
 }
 
 function blockbot_init_1(App $a) {
@@ -55,7 +54,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/',
@@ -75,13 +74,19 @@ function blockbot_init_1(App $a) {
 		'Scrapy/', 'github-camo', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
 		'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/',
 		'7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/',
-		'HubSpot Crawler'];
+		'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio'];
 
-	if (!Config::get('blockbot', 'good_crawlers')) {
+	if (!DI::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')) {
+	if (DI::config()->get('blockbot', 'block_gab')) {
 		$agents[] = 'GabSocial/';
 	}
 
@@ -92,7 +97,7 @@ function blockbot_init_1(App $a) {
 	}
 
 	// This switch here is only meant for developers who want to add more bots to the list above, it is not safe for production.
-	if (!Config::get('blockbot', 'training')) {
+	if (!DI::config()->get('blockbot', 'training')) {
 		return;
 	}
 
@@ -111,7 +116,7 @@ function blockbot_init_1(App $a) {
 		'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/',
 		'lua-resty-http/'];
 
-	if (Config::get('blockbot', 'good_crawlers')) {
+	if (DI::config()->get('blockbot', 'good_crawlers')) {
 		$agents = array_merge($agents, $good_agents);
 	}