[various] Remove redundant profile_uid field from profile query

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

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index cb580888ec8110d08c8a6c31e589322b35cc3386..798e1a0494ce7e39d0e33a218d47a65770a39472 100644 (file)
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -10,8 +10,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -54,13 +52,13 @@ function langfilter_addon_settings(App $a, &$s)
 
        $t = Renderer::getMarkupTemplate("settings.tpl", "addon/langfilter/");
        $s .= Renderer::replaceMacros($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'),
+               '$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.'),
+               '$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".')],
+               '$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'),
        ]);
 
        return;
@@ -79,10 +77,10 @@ function langfilter_addon_settings_post(App $a, &$b)
        }
 
        if (!empty($_POST['langfilter-settings-submit'])) {
-               PConfig::set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
+               DI::pConfig()->set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
                $enable = (!empty($_POST['langfilter_enable']) ? intval($_POST['langfilter_enable']) : 0);
                $disable = 1 - $enable;
-               PConfig::set(local_user(), 'langfilter', 'disable', $disable);
+               DI::pConfig()->set(local_user(), 'langfilter', 'disable', $disable);
                $minconfidence = 0 + $_POST['langfilter_minconfidence'];
                if (!$minconfidence) {
                        $minconfidence = 0;
@@ -91,7 +89,7 @@ function langfilter_addon_settings_post(App $a, &$b)
                } elseif ($minconfidence > 100) {
                        $minconfidence = 100;
                }
-               PConfig::set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0);
+               DI::pConfig()->set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0);
 
                $minlength = 0 + $_POST['langfilter_minlength'];
                if (!$minlength) {
@@ -99,9 +97,9 @@ function langfilter_addon_settings_post(App $a, &$b)
                } elseif ($minlength < 0) {
                        $minlength = 32;
                }
-               PConfig::set(local_user(), 'langfilter', 'minlength', $minlength);
+               DI::pConfig()->set(local_user(), 'langfilter', 'minlength', $minlength);
 
-               info(L10n::t('Language Filter Settings saved.') . EOL);
+               info(DI::l10n()->t('Language Filter Settings saved.') . EOL);
        }
 }
 
@@ -198,6 +196,6 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
        }
 
        if (!in_array($iso2, $read_languages_array)) {
-               $hook_data['filter_reasons'][] = L10n::t('Filtered language: %s', ucfirst($lang));
+               $hook_data['filter_reasons'][] = DI::l10n()->t('Filtered language: %s', ucfirst($lang));
        }
 }