use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+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
function langfilter_install()
{
- 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');
+ 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
* 3rd parse a SMARTY3 template, replacing some translateable strings for the form
*/
-function langfilter_addon_settings(App $a, &$s)
+function langfilter_addon_settings(array &$data)
{
- if (!local_user()) {
+ if (!DI::userSession()->getLocalUserId()) {
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');
-
- $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'),
+ $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'enable',
+ !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'disable'));
+
+ $languages = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'languages');
+ $minconfidence = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence', 0) * 100;
+ $minlength = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength', 32);
+
+ $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
* 3rd save the settings to the DB for later usage
*/
-function langfilter_addon_settings_post(App $a, &$b)
+function langfilter_addon_settings_post(array &$b)
{
- if (!local_user()) {
+ if (!DI::userSession()->getLocalUserId()) {
return;
}
if (!empty($_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 ($minlength < 0) {
+ $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(DI::userSession()->getLocalUserId(), 'langfilter', 'enable' , $enable);
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'langfilter', 'languages' , $languages);
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence', $minconfidence);
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength' , $minlength);
}
}
* expand it again.
*/
-function langfilter_prepare_body_content_filter(App $a, &$hook_data)
+function langfilter_prepare_body_content_filter(&$hook_data)
{
- $logged_user = local_user();
+ $logged_user = DI::userSession()->getLocalUserId();
if (!$logged_user) {
return;
}
// Never filter own messages
// TODO: find a better way to extract this
- $logged_user_profile = $a->getBaseURL() . '/profile/' . $a->user['nickname'];
+ $logged_user_profile = DI::baseUrl()->get() . '/profile/' . DI::userSession()->getLocalUserNickname();
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 = BBCode::toPlaintext($hook_data['item']['body'], false);
+ $naked_body = strip_tags(
+ $hook_data['item']['rendered-html']
+ ??''?: // Equivalent of !empty()
+ BBCode::convert($hook_data['item']['body'], false, BBCode::ACTIVITYPUB, 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', 32);
+ $minlen = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength', 32);
if (!$minlen) {
$minlen = 32;
}
return;
}
- $read_languages_string = PConfig::get(local_user(), 'langfilter', 'languages');
- $minconfidence = PConfig::get(local_user(), 'langfilter', 'minconfidence');
+ $read_languages_string = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'languages');
+ $minconfidence = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence');
// Don't filter if no spoken languages are configured
if (!$read_languages_string) {
}
$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);
return;
}
- $lang = Text_LanguageDetect_ISO639::code2ToName($iso2);
+ $lang = $iso639->languageByCode1($iso2);
} else {
$opts = $hook_data['item']['postopts'];
if (!$opts) {
$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
}
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));
}
}
projects / friendica-addons.git / blobdiff