X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=langfilter%2Flangfilter.php;h=61b357f6cfd36d117a66a2f227147c50b41f354f;hb=ca134e9ed3ff5ad556d602598568bf13fccdb9e6;hp=9d7b20a92c7ba9569517531f6dc08b3f382b539b;hpb=2e16db590a76fe46178ce881c1fd0e2c71e3e6d9;p=friendica-addons.git

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 9d7b20a9..61b357f6 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -31,18 +31,18 @@ function langfilter_install()
  * 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, [
@@ -67,9 +67,9 @@ function langfilter_addon_settings(App $a, array &$data)
  * 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;
 	}
 
@@ -82,10 +82,10 @@ function langfilter_addon_settings_post(App $a, &$b)
 			$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);
 	}
 }
 
@@ -98,16 +98,16 @@ function langfilter_addon_settings_post(App $a, &$b)
  *     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;
 	}
@@ -122,13 +122,13 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 	$naked_body = strip_tags(
 		$hook_data['item']['rendered-html']
 		??''?: // Equivalent of !empty()
-		BBCode::convert($hook_data['item']['body'], false, BBCode::INTERNAL, true)
+		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 = DI::pConfig()->get(local_user(), 'langfilter', 'minlength', 32);
+	$minlen = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength', 32);
 	if (!$minlen) {
 		$minlen = 32;
 	}
@@ -137,8 +137,8 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 		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) {