X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=langfilter%2Flangfilter.php;h=9d7b20a92c7ba9569517531f6dc08b3f382b539b;hb=34437e368f24adbcd418bd82e6de41d839b1bc05;hp=f0d8b15f5d4b38ddbd561f407d711e4aac39386b;hpb=5152eb4cd46958e0bfccf1f94d1face82ed0fec5;p=friendica-addons.git diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index f0d8b15f..9d7b20a9 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -8,9 +8,10 @@ */ use Friendica\App; -use Friendica\Core\Addon; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Content\Text\BBCode; +use Friendica\Core\Hook; +use Friendica\Core\Renderer; +use Friendica\DI; /* Define the hooks we want to use * that is, we have settings, we need to save the settings and we want @@ -19,16 +20,9 @@ use Friendica\Core\PConfig; function langfilter_install() { - Addon::registerHook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body', 10); - Addon::registerHook('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings'); - Addon::registerHook('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); -} - -function langfilter_uninstall() -{ - Addon::unregisterHook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body'); - Addon::unregisterHook('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings'); - Addon::unregisterHook('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); + Hook::register('prepare_body_content_filter', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body_content_filter', 10); + Hook::register('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings'); + Hook::register('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); } /* The settings @@ -37,33 +31,34 @@ function langfilter_uninstall() * 3rd parse a SMARTY3 template, replacing some translateable strings for the form */ -function langfilter_addon_settings(App $a, &$s) +function langfilter_addon_settings(App $a, array &$data) { if (!local_user()) { return; } - $enable_checked = (intval(PConfig::get(local_user(), 'langfilter', 'disable')) ? '' : ' checked="checked" '); - $languages = PConfig::get(local_user(), 'langfilter', 'languages'); - $minconfidence = PConfig::get(local_user(), 'langfilter', 'minconfidence') * 100; - $minlength = PConfig::get(local_user(), 'langfilter', 'minlength'); + $enabled = DI::pConfig()->get(local_user(), 'langfilter', 'enable', + !DI::pConfig()->get(local_user(), 'langfilter', 'disable')); - if (!$languages) { - $languages = 'en,de,fr,it,es'; - } + $languages = DI::pConfig()->get(local_user(), 'langfilter', 'languages'); + $minconfidence = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence', 0) * 100; + $minlength = DI::pConfig()->get(local_user(), 'langfilter', 'minlength', 32); - $t = get_markup_template("settings.tpl", "addon/langfilter/"); - $s .= replace_macros($t, [ - '$title' => L10n::t("Language Filter"), - '$intro' => L10n::t('This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them.'), - '$enabled' => ['langfilter_enable', L10n::t('Use the language filter'), $enable_checked, ''], - '$languages' => ['langfilter_languages', L10n::t('Able to read'), $languages, L10n::t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".')], - '$minconfidence' => ['langfilter_minconfidence', L10n::t('Minimum confidence in language detection'), $minconfidence, L10n::t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.')], - '$minlength' => ['langfilter_minlength', L10n::t('Minimum length of message body'), $minlength, L10n::t('Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).')], - '$submit' => L10n::t('Save Settings'), + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/langfilter/'); + $html = Renderer::replaceMacros($t, [ + '$intro' => DI::l10n()->t('This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'), + '$enabled' => ['langfilter_enable', DI::l10n()->t('Use the language filter'), $enabled], + '$languages' => ['langfilter_languages', DI::l10n()->t('Able to read'), $languages, DI::l10n()->t('List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".')], + '$minconfidence' => ['langfilter_minconfidence', DI::l10n()->t('Minimum confidence in language detection'), $minconfidence, DI::l10n()->t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.')], + '$minlength' => ['langfilter_minlength', DI::l10n()->t('Minimum length of message body'), $minlength, DI::l10n()->t('Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).')], ]); - return; + $data = [ + 'addon' => 'langfilter', + 'title' => DI::l10n()->t('Language Filter'), + 'html' => $html, + 'submit' => ['langfilter-settings-submit' => DI::l10n()->t('Save Settings')], + ]; } /* Save the settings @@ -78,30 +73,19 @@ function langfilter_addon_settings_post(App $a, &$b) return; } - if ($_POST['langfilter-settings-submit']) { - PConfig::set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages'])); - $enable = ((x($_POST, 'langfilter_enable')) ? intval($_POST['langfilter_enable']) : 0); - $disable = 1 - $enable; - PConfig::set(local_user(), 'langfilter', 'disable', $disable); - $minconfidence = 0 + $_POST['langfilter_minconfidence']; - if (!$minconfidence) { - $minconfidence = 0; - } elseif ($minconfidence < 0) { - $minconfidence = 0; - } elseif ($minconfidence > 100) { - $minconfidence = 100; - } - PConfig::set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0); - - $minlength = 0 + $_POST['langfilter_minlength']; - if (!$minlength) { - $minlength = 32; - } elseif ($minlengt8h < 0) { + if (!empty($_POST['langfilter-settings-submit'])) { + $enable = intval($_POST['langfilter_enable'] ?? 0); + $languages = trim($_POST['langfilter_languages'] ?? ''); + $minconfidence = max(0, min(100, intval($_POST['langfilter_minconfidence'] ?? 0))) / 100; + $minlength = intval($_POST['langfilter_minlength'] ?? 32); + if ($minlength <= 0) { $minlength = 32; } - PConfig::set(local_user(), 'langfilter', 'minlength', $minlength); - info(L10n::t('Language Filter Settings saved.') . EOL); + DI::pConfig()->set(local_user(), 'langfilter', 'enable' , $enable); + DI::pConfig()->set(local_user(), 'langfilter', 'languages' , $languages); + DI::pConfig()->set(local_user(), 'langfilter', 'minconfidence', $minconfidence); + DI::pConfig()->set(local_user(), 'langfilter', 'minlength' , $minlength); } } @@ -114,7 +98,7 @@ function langfilter_addon_settings_post(App $a, &$b) * expand it again. */ -function langfilter_prepare_body(App $a, &$b) +function langfilter_prepare_body_content_filter(App $a, &$hook_data) { $logged_user = local_user(); if (!$logged_user) { @@ -123,61 +107,91 @@ function langfilter_prepare_body(App $a, &$b) // Never filter own messages // TODO: find a better way to extract this - $logged_user_profile = $a->get_baseurl() . '/profile/' . $a->user['nickname']; - if ($logged_user_profile == $b['item']['author-link']) { + $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->getLoggedInUserNickname(); + if ($logged_user_profile == $hook_data['item']['author-link']) { return; } // Don't filter if language filter is disabled - if (PConfig::get($logged_user, 'langfilter', 'disable')) { + if (!DI::pConfig()->get($logged_user, 'langfilter', 'enable', + !DI::pConfig()->get($logged_user, 'langfilter', 'disable')) + ) { return; } + $naked_body = strip_tags( + $hook_data['item']['rendered-html'] + ??''?: // Equivalent of !empty() + BBCode::convert($hook_data['item']['body'], false, BBCode::INTERNAL, true) + ); + + $naked_body = preg_replace('#\s+#', ' ', trim($naked_body)); + // Don't filter if body lenght is below minimum - $minlen = PConfig::get(local_user(), 'langfilter', 'minlength'); + $minlen = DI::pConfig()->get(local_user(), 'langfilter', 'minlength', 32); if (!$minlen) { $minlen = 32; } - if (strlen($b['item']['body']) < $minlen) { + + if (strlen($naked_body) < $minlen) { return; } - $spoken_config = PConfig::get(local_user(), 'langfilter', 'languages'); - $minconfidence = PConfig::get(local_user(), 'langfilter', 'minconfidence'); + $read_languages_string = DI::pConfig()->get(local_user(), 'langfilter', 'languages'); + $minconfidence = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence'); // Don't filter if no spoken languages are configured - if (!$spoken_config) + if (!$read_languages_string) { return; - $spoken_languages = explode(',', $spoken_config); + } + $read_languages_array = explode(',', $read_languages_string); + + $iso639 = new Matriphe\ISO639\ISO639; // Extract the language of the post - $opts = $b['item']['postopts']; - if (!$opts) { - // no options associated to post - return; - } - if (!preg_match('/\blang=([^;]*);([^:]*)/', $opts, $matches)) { - // no lang options associated to post - return; - } + if (!empty($hook_data['item']['language'])) { + $languages = json_decode($hook_data['item']['language'], true); + if (!is_array($languages)) { + return; + } + + foreach ($languages as $iso2 => $confidence) { + break; + } + + if (empty($iso2)) { + return; + } - $lang = $matches[1]; - $confidence = $matches[2]; + $lang = $iso639->languageByCode1($iso2); + } else { + $opts = $hook_data['item']['postopts']; + if (!$opts) { + // no options associated to post + return; + } + + if (!preg_match('/\blang=([^;]*);([^:]*)/', $opts, $matches)) { + // no lang options associated to post + return; + } + + $lang = $matches[1]; + $confidence = $matches[2]; + + $iso2 = $iso639->code1ByLanguage($lang); + } // Do not filter if language detection confidence is too low if ($minconfidence && $confidence < $minconfidence) { return; } - $iso2 = Text_LanguageDetect_ISO639::nameToCode2($lang); - if (!$iso2) { return; } - $spoken = in_array($iso2, $spoken_languages); - if (!$spoken) { - $rnd = random_string(8); - $b['html'] = ''; + if (!in_array($iso2, $read_languages_array)) { + $hook_data['filter_reasons'][] = DI::l10n()->t('Filtered language: %s', ucfirst($lang)); } }