Merge pull request #1187 from tobiasd/20211010-regenlng

[friendica-addons.git] / langfilter / langfilter.php

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 954884219982864ce0055fce134a156871300411..aeb53eebde126892f39a99deca64d2ea7905bade 100644 (file)
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -48,9 +48,9 @@ function langfilter_addon_settings(App $a, &$s)
        $t = Renderer::getMarkupTemplate("settings.tpl", "addon/langfilter/");
        $s .= Renderer::replaceMacros($t, [
                '$title'         => DI::l10n()->t("Language Filter"),
-               '$intro'         => DI::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.'),
+               '$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'), $enable_checked, ''],
-               '$languages'     => ['langfilter_languages', DI::l10n()->t('Able to read'), $languages, DI::l10n()->t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".')],
+               '$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).')],
                '$submit'        => DI::l10n()->t('Save Settings'),
@@ -105,7 +105,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 
        // Never filter own messages
        // TODO: find a better way to extract this
-       $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->user['nickname'];
+       $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->getLoggedInUserNickname();
        if ($logged_user_profile == $hook_data['item']['author-link']) {
                return;
        }
@@ -117,7 +117,11 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
                return;
        }
 
-       $naked_body = BBCode::toPlaintext($hook_data['item']['body'], false);
+       if (!empty($hook_data['item']['rendered-html'])) {
+               $naked_body = strip_tags($hook_data['item']['rendered-html']);
+       } else {
+               $naked_body = BBCode::toPlaintext($hook_data['item']['body'], false);
+       }
 
        // Don't filter if body lenght is below minimum
        $minlen = DI::pConfig()->get(local_user(), 'langfilter', 'minlength', 32);
@@ -138,6 +142,8 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
        }
        $read_languages_array = explode(',', $read_languages_string);
 
+       $iso639 = new Matriphe\ISO639\ISO639;
+
        // Extract the language of the post
        if (!empty($hook_data['item']['language'])) {
                $languages = json_decode($hook_data['item']['language'], true);
@@ -153,7 +159,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
                        return;
                }
 
-               $lang = Text_LanguageDetect_ISO639::code2ToName($iso2);
+               $lang = $iso639->languageByCode1($iso2);
        } else {
                $opts = $hook_data['item']['postopts'];
                if (!$opts) {
@@ -169,7 +175,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
                $lang = $matches[1];
                $confidence = $matches[2];
 
-               $iso2 = Text_LanguageDetect_ISO639::nameToCode2($lang);
+               $iso2 = $iso639->code1ByLanguage($lang);
        }
 
        // Do not filter if language detection confidence is too low