*/
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';
Hook::register('init_1', __FILE__, 'blockbot_init_1');
}
-
-function blockbot_uninstall() {
- Hook::unregister('init_1', __FILE__, 'blockbot_init_1');
-}
-
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);
}
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/',
+ 'PTST/'];
// List of known crawlers.
$agents = ['SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
'Scrapy/', 'github-camo', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/',
'7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/',
- 'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio'];
+ 'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/',
+ 'SummalyBot/', 'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
+ 'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
+ 'SkypeUriPreview Preview/', 'Semanticbot/', 'Embed PHP library', 'XoviOnpageCrawler;',
+ 'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher'];
- 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/';
}
}
// 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;
}
'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/',
'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests',
'WordPress/', 'http.rb/', 'Apache-HttpClient/', 'WordPress.com;', 'Pleroma',
- 'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/',
- 'lua-resty-http/'];
+ 'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/', 'FeedlyApp/',
+ 'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/',
+ 'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com'];
- if (Config::get('blockbot', 'good_crawlers')) {
+ if (DI::config()->get('blockbot', 'good_crawlers')) {
$agents = array_merge($agents, $good_agents);
}