https://reisub.nsupdate.info/git / friendica-addons.git / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[advancedcontentfilter] Stop using advancedcontentfilter_get_rules() outside of route...
[friendica-addons.git/.git] / advancedcontentfilter / advancedcontentfilter.php
diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 6925f81..418b253 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -55,7 +55,7 @@ use Symfony\Component\ExpressionLanguage;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
-function advancedcontentfilter_install(App $a)
+function advancedcontentfilter_install()
 {
        Hook::register('dbstructure_definition'     , __FILE__, 'advancedcontentfilter_dbstructure_definition');
        Hook::register('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
@@ -71,7 +71,7 @@ function advancedcontentfilter_install(App $a)
  * Hooks
  */
 
-function advancedcontentfilter_dbstructure_definition(App $a, &$database)
+function advancedcontentfilter_dbstructure_definition(&$database)
 {
        $database['advancedcontentfilter_rules'] = [
                'comment' => 'Advancedcontentfilter addon rules',
@@ -115,7 +115,7 @@ function advancedcontentfilter_get_filter_fields(array $item)
        return $vars;
 }
 
-function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
+function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 {
        static $expressionLanguage;
 
@@ -123,21 +123,21 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
                $expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
        }
 
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
        $vars = advancedcontentfilter_get_filter_fields($hook_data['item']);
 
-       $rules = DI::cache()->get('rules_' . local_user());
+       $rules = DI::cache()->get('rules_' . DI::userSession()->getLocalUserId());
        if (!isset($rules)) {
                $rules = DBA::toArray(DBA::select(
                        'advancedcontentfilter_rules',
                        ['name', 'expression', 'serialized'],
-                       ['uid' => local_user(), 'active' => true]
+                       ['uid' => DI::userSession()->getLocalUserId(), 'active' => true]
                ));
 
-               DI::cache()->set('rules_' . local_user(), $rules);
+               DI::cache()->set('rules_' . DI::userSession()->getLocalUserId(), $rules);
        }
 
        if ($rules) {
@@ -163,9 +163,9 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
 }
 
 
-function advancedcontentfilter_addon_settings(App $a, array &$data)
+function advancedcontentfilter_addon_settings(array &$data)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
@@ -187,10 +187,10 @@ function advancedcontentfilter_addon_settings(App $a, array &$data)
  */
 function advancedcontentfilter_module() {}
 
-function advancedcontentfilter_init(App $a)
+function advancedcontentfilter_init()
 {
        if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
-               $slim = new \Slim\App();
+               $slim = \Slim\Factory\AppFactory::create();
 
                require __DIR__ . '/src/middlewares.php';
 
@@ -201,14 +201,14 @@ function advancedcontentfilter_init(App $a)
        }
 }
 
-function advancedcontentfilter_content(App $a)
+function advancedcontentfilter_content()
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return Login::form('/' . implode('/', DI::args()->getArgv()));
        }
 
        if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'help') {
-               $user = User::getById(local_user());
+               $user = User::getById(DI::userSession()->getLocalUserId());
 
                $lang = $user['language'];
 
@@ -252,8 +252,8 @@ function advancedcontentfilter_content(App $a)
                                'rule_expression'   => DI::l10n()->t('Rule Expression'),
                                'cancel'            => DI::l10n()->t('Cancel'),
                        ],
-                       '$current_theme' => $a->getCurrentTheme(),
-                       '$rules' => advancedcontentfilter_get_rules(),
+                       '$current_theme' => DI::app()->getCurrentTheme(),
+                       '$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
                        '$form_security_token' => BaseModule::getFormSecurityToken()
                ]);
        }
@@ -272,9 +272,9 @@ function advancedcontentfilter_build_fields($data)
 
        if (!empty($data['expression'])) {
                // Using a dummy item to validate the field existence
-               $condition = ["(`uid` = ? OR `uid` = 0)", local_user()];
+               $condition = ["(`uid` = ? OR `uid` = 0)", DI::userSession()->getLocalUserId()];
                $params = ['order' => ['uid' => true]];
-               $item_row = Post::selectFirstForUser(local_user(), [], $condition, $params);
+               $item_row = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), [], $condition, $params);
 
                if (!DBA::isResult($item_row)) {
                        throw new HTTPException\NotFoundException(DI::l10n()->t('This addon requires this node having at least one post'));
@@ -305,31 +305,33 @@ function advancedcontentfilter_build_fields($data)
  * API
  */
 
-function advancedcontentfilter_get_rules()
+function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
        }
 
-       $rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => local_user()]));
+       $rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()]));
 
-       return json_encode($rules);
+       $response->getBody()->write(json_encode($rules));
+       return $response->withHeader('Content-Type', 'application/json');
 }
 
 function advancedcontentfilter_get_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
        }
 
-       $rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => local_user()]);
+       $rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()]);
 
-       return json_encode($rule);
+       $response->getBody()->write(json_encode($rule));
+       return $response->withHeader('Content-Type', 'application/json');
 }
 
-function advancedcontentfilter_post_rules(ServerRequestInterface $request)
+function advancedcontentfilter_post_rules(ServerRequestInterface $request, ResponseInterface $response)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
        }
 
@@ -349,7 +351,7 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
                throw new HTTPException\BadRequestException(DI::l10n()->t('The rule name and expression are required.'));
        }
 
-       $fields['uid'] = local_user();
+       $fields['uid'] = DI::userSession()->getLocalUserId();
        $fields['created'] = DateTimeFormat::utcNow();
 
        if (!DBA::insert('advancedcontentfilter_rules', $fields)) {
@@ -358,14 +360,15 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
 
        $rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => DBA::lastInsertId()]);
 
-       DI::cache()->delete('rules_' . local_user());
+       DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
 
-       return json_encode(['message' => DI::l10n()->t('Rule successfully added'), 'rule' => $rule]);
+       $response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully added'), 'rule' => $rule]));
+       return $response->withHeader('Content-Type', 'application/json');
 }
 
 function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
        }
 
@@ -373,7 +376,7 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
                throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid form security token, please refresh the page.'));
        }
 
-       if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+       if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()])) {
                throw new HTTPException\NotFoundException(DI::l10n()->t('Rule doesn\'t exist or doesn\'t belong to you.'));
        }
 
@@ -389,14 +392,15 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
                throw new HTTPException\ServiceUnavailableException(DBA::errorMessage());
        }
 
-       DI::cache()->delete('rules_' . local_user());
+       DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
 
-       return json_encode(['message' => DI::l10n()->t('Rule successfully updated')]);
+       $response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully updated')]));
+       return $response->withHeader('Content-Type', 'application/json');
 }
 
 function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
        }
 
@@ -404,7 +408,7 @@ function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request,
                throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid form security token, please refresh the page.'));
        }
 
-       if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+       if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()])) {
                throw new HTTPException\NotFoundException(DI::l10n()->t('Rule doesn\'t exist or doesn\'t belong to you.'));
        }
 
@@ -412,14 +416,15 @@ function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request,
                throw new HTTPException\ServiceUnavailableException(DBA::errorMessage());
        }
 
-       DI::cache()->delete('rules_' . local_user());
+       DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
 
-       return json_encode(['message' => DI::l10n()->t('Rule successfully deleted')]);
+       $response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully deleted')]));
+       return $response->withHeader('Content-Type', 'application/json');
 }
 
 function advancedcontentfilter_get_variables_guid(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
        }
 
@@ -427,9 +432,9 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques
                throw new HTTPException\BadRequestException(DI::l10n()->t('Missing argument: guid.'));
        }
 
-       $condition = ["`guid` = ? AND (`uid` = ? OR `uid` = 0)", $args['guid'], local_user()];
+       $condition = ["`guid` = ? AND (`uid` = ? OR `uid` = 0)", $args['guid'], DI::userSession()->getLocalUserId()];
        $params = ['order' => ['uid' => true]];
-       $item_row = Post::selectFirstForUser(local_user(), [], $condition, $params);
+       $item_row = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), [], $condition, $params);
 
        if (!DBA::isResult($item_row)) {
                throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown post with guid: %s', $args['guid']));
@@ -437,7 +442,8 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques
 
        $return = advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row));
 
-       return json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]);
+       $response->getBody()->write(json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]));
+       return $response->withHeader('Content-Type', 'application/json');
 }
 
 /**
@@ -455,7 +461,7 @@ function advancedcontentfilter_prepare_item_row(array $item_row): array
        $item_row['tags'] = $tags['tags'];
        $item_row['hashtags'] = $tags['hashtags'];
        $item_row['mentions'] = $tags['mentions'];
-       $item_row['attachments'] = Post\Media::splitAttachments($item_row['uri-id'], $item_row['guid'] ?? '');
+       $item_row['attachments'] = DI::postMediaRepository()->splitAttachments($item_row['uri-id']);
 
        return $item_row;
 }
mirror https://github.com/friendica/friendica-addons.git