X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=langfilter%2Flangfilter.php;h=f6a6ce210500757695b043e127641d11e14234ef;hb=87a392a3c793b1b9b781939b46cf4189f15fb881;hp=81f9f6ecb4bf12f772a540a35eabd9f5c952ca96;hpb=f8c162cbfb777793891f885e019eb8eae319dce1;p=friendica-addons.git

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 81f9f6ec..f6a6ce21 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -19,13 +19,14 @@ use Friendica\Core\PConfig;
 
 function langfilter_install()
 {
-	Addon::registerHook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body', 10);
+	Addon::registerHook('prepare_body_content_filter', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body_content_filter', 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_content_filter', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body_content_filter');
 	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');
@@ -55,11 +56,11 @@ function langfilter_addon_settings(App $a, &$s)
 	$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 of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings.'),
+		'$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('I speak'), $languages, L10n::t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".')],
+		'$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 length of message body for language filter to be used. Posts shorter than this number of characters will not be filtered.')],
+		'$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'),
 	]);
 
@@ -114,7 +115,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) {
@@ -124,7 +125,7 @@ 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']) {
+	if ($logged_user_profile == $hook_data['item']['author-link']) {
 		return;
 	}
 
@@ -138,24 +139,26 @@ function langfilter_prepare_body(App $a, &$b)
 	if (!$minlen) {
 		$minlen = 32;
 	}
-	if (strlen($b['item']['body']) < $minlen) {
+	if (strlen($hook_data['item']['body']) < $minlen) {
 		return;
 	}
 
-	$spoken_config = PConfig::get(local_user(), 'langfilter', 'languages');
+	$read_languages_string = PConfig::get(local_user(), 'langfilter', 'languages');
 	$minconfidence = 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);
 
 	// Extract the language of the post
-	$opts = $b['item']['postopts'];
+	$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;
@@ -174,10 +177,8 @@ function langfilter_prepare_body(App $a, &$b)
 	if (!$iso2) {
 		return;
 	}
-	$spoken = in_array($iso2, $spoken_languages);
 
-	if (!$spoken) {
-		$rnd = random_string(8);
-		$b['html'] = '<div id="langfilter-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'langfilter-' . $rnd . '\'); >' . L10n::t('unspoken language %s - Click to open/close', $lang) . '</div><div id="langfilter-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';
+	if (!in_array($iso2, $read_languages_array)) {
+		$hook_data['filter_reasons'][] = L10n::t('Filtered language: %s', ucfirst($lang));
 	}
 }