* 3rd parse a SMARTY3 template, replacing some translateable strings for the form
*/
-function langfilter_addon_settings(App $a, array &$data)
+function langfilter_addon_settings(array &$data)
{
- if (!local_user()) {
+ if (!DI::userSession()->getLocalUserId()) {
return;
}
- $enabled = DI::pConfig()->get(local_user(), 'langfilter', 'enable',
- !DI::pConfig()->get(local_user(), 'langfilter', 'disable'));
+ $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'enable',
+ !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'disable'));
- $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);
+ $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, [
* 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;
}
$minlength = 32;
}
- 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);
+ 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 = DI::baseUrl()->get() . '/profile/' . $a->getLoggedInUserNickname();
+ $logged_user_profile = DI::baseUrl() . '/profile/' . DI::userSession()->getLocalUserNickname();
if ($logged_user_profile == $hook_data['item']['author-link']) {
return;
}
$naked_body = strip_tags(
$hook_data['item']['rendered-html']
??''?: // Equivalent of !empty()
- BBCode::convert($hook_data['item']['body'], false, BBCode::ACTIVITYPUB, true)
+ BBCode::convertForUriId($hook_data['item']['uri-id'], $hook_data['item']['body'], BBCode::ACTIVITYPUB)
);
$naked_body = preg_replace('#\s+#', ' ', trim($naked_body));
// Don't filter if body lenght is below minimum
- $minlen = DI::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 = DI::pConfig()->get(local_user(), 'langfilter', 'languages');
- $minconfidence = DI::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) {
return;
}
- $lang = $iso639->languageByCode1($iso2);
+ $lang = $iso639->languageByCode1(substr($iso2, 0, 2));
} else {
$opts = $hook_data['item']['postopts'];
if (!$opts) {