- added some type-hints
- changed double-quotes to singl
- cleaned up file (e.g. wrong place for curly braces)
This commit is contained in:
Roland Häder 2022-06-23 06:20:19 +02:00
parent 3bda8dfa32
commit 0ecd772958
Signed by: roland
GPG Key ID: C82EDE5DDFA0BA77
1 changed files with 42 additions and 33 deletions

View File

@ -6,6 +6,7 @@
* Author: Michael Vogel <https://pirati.ca/profile/heluecht> * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\DI; use Friendica\DI;
@ -16,51 +17,54 @@ function leistungsschutzrecht_install() {
Hook::register('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); Hook::register('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo');
} }
function leistungsschutzrecht_getsiteinfo($a, &$siteinfo) { function leistungsschutzrecht_getsiteinfo(App $a,array &$siteinfo) {
if (!isset($siteinfo["url"]) || empty($siteinfo['type'])) { if (!isset($siteinfo['url']) || empty($siteinfo['type'])) {
return; return;
} }
// Avoid any third party pictures, to avoid copyright issues // Avoid any third party pictures, to avoid copyright issues
if (!in_array($siteinfo['type'], ['photo', 'video']) && DI::config()->get('leistungsschutzrecht', 'suppress_photos', false)) { if (!in_array($siteinfo['type'], ['photo', 'video']) && DI::config()->get('leistungsschutzrecht', 'suppress_photos', false)) {
unset($siteinfo["image"]); unset($siteinfo['image']);
unset($siteinfo["images"]); unset($siteinfo['images']);
} }
if (!leistungsschutzrecht_is_member_site($siteinfo["url"])) { if (!leistungsschutzrecht_is_member_site($siteinfo['url'])) {
return; return;
} }
if (!empty($siteinfo["text"])) { if (!empty($siteinfo['text'])) {
$siteinfo["text"] = leistungsschutzrecht_cuttext($siteinfo["text"]); $siteinfo['text'] = leistungsschutzrecht_cuttext($siteinfo['text']);
} }
unset($siteinfo["keywords"]); unset($siteinfo['keywords']);
} }
function leistungsschutzrecht_cuttext($text) { function leistungsschutzrecht_cuttext(string $text): string
$text = str_replace(["\r", "\n"], [" ", " "], $text); {
$text = str_replace(["\r", "\n"], [' ', ' '], $text);
do { do {
$oldtext = $text; $oldtext = $text;
$text = str_replace(" ", " ", $text); $text = str_replace(' ', ' ', $text);
} while ($oldtext != $text); } while ($oldtext != $text);
$words = explode(" ", $text); $words = explode(' ', $text);
$text = ""; $text = '';
$count = 0; $count = 0;
$limit = 7; $limit = 7;
foreach ($words as $word) { foreach ($words as $word) {
if ($text != "") if ($text != '') {
$text .= " "; $text .= ' ';
}
$text .= $word; $text .= $word;
if (++$count >= $limit) { if (++$count >= $limit) {
if (sizeof($words) > $limit) if (sizeof($words) > $limit) {
$text .= " ..."; $text .= ' ...';
}
break; break;
} }
@ -71,7 +75,7 @@ function leistungsschutzrecht_cuttext($text) {
function leistungsschutzrecht_fetchsites() function leistungsschutzrecht_fetchsites()
{ {
// This list works - but question is how current it is // This list works - but question is how current it is
$url = "http://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt"; $url = 'https://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt';
$sitelist = DI::httpClient()->fetch($url); $sitelist = DI::httpClient()->fetch($url);
$siteurls = explode(',', $sitelist); $siteurls = explode(',', $sitelist);
@ -123,23 +127,27 @@ function leistungsschutzrecht_fetchsites()
} }
} }
function leistungsschutzrecht_is_member_site($url) { function leistungsschutzrecht_is_member_site(string $url)
{
$sites = DI::config()->get('leistungsschutzrecht','sites'); $sites = DI::config()->get('leistungsschutzrecht','sites');
if ($sites == "") if ($sites == '') {
return(false); return false;
}
if (sizeof($sites) == 0) if (sizeof($sites) == 0) {
return(false); return false;
}
$urldata = parse_url($url); $urldata = parse_url($url);
if (!isset($urldata["host"])) if (!isset($urldata['host'])) {
return(false); return false;
}
$cleanedurlpart = explode("%", $urldata["host"]); $cleanedurlpart = explode('%', $urldata['host']);
$hostname = explode(".", $cleanedurlpart[0]); $hostname = explode('.', $cleanedurlpart[0]);
if (empty($hostname)) { if (empty($hostname)) {
return false; return false;
} }
@ -148,21 +156,22 @@ function leistungsschutzrecht_is_member_site($url) {
return false; return false;
} }
$site = $hostname[sizeof($hostname) - 2].".".$hostname[sizeof($hostname) - 1]; $site = $hostname[sizeof($hostname) - 2] . '.' . $hostname[sizeof($hostname) - 1];
return (isset($sites[$site])); return (isset($sites[$site]));
} }
function leistungsschutzrecht_cron($a,$b) { function leistungsschutzrecht_cron(App $a,$b)
$last = DI::config()->get('leistungsschutzrecht','last_poll'); {
$last = DI::config()->get('leistungsschutzrecht', 'last_poll');
if($last) { if ($last) {
$next = $last + 86400; $next = $last + 86400;
if($next > time()) { if ($next > time()) {
Logger::notice('poll intervall not reached'); Logger::notice('poll intervall not reached');
return; return;
} }
} }
leistungsschutzrecht_fetchsites(); leistungsschutzrecht_fetchsites();
DI::config()->set('leistungsschutzrecht','last_poll', time()); DI::config()->set('leistungsschutzrecht', 'last_poll', time());
} }