Fix signature of hooks to work with modern friendica

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

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 45ab3f3e0101bf07b0102004a838058fb198fc61..f29da0cf8a0c888f32c8b4a0370ddfe3693cc830 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -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) {
@@ -165,7 +165,7 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
 
 function advancedcontentfilter_addon_settings(App $a, array &$data)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
@@ -180,6 +180,11 @@ function advancedcontentfilter_addon_settings(App $a, array &$data)
  * Module
  */
 
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
 function advancedcontentfilter_module() {}
 
 function advancedcontentfilter_init(App $a)
@@ -198,12 +203,12 @@ function advancedcontentfilter_init(App $a)
 
 function advancedcontentfilter_content(App $a)
 {
-       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'];
 
@@ -267,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'));
@@ -302,29 +307,29 @@ function advancedcontentfilter_build_fields($data)
 
 function advancedcontentfilter_get_rules()
 {
-       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);
 }
 
 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);
 }
 
 function advancedcontentfilter_post_rules(ServerRequestInterface $request)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
        }
 
@@ -344,7 +349,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)) {
@@ -353,14 +358,14 @@ 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]);
 }
 
 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'));
        }
 
@@ -368,7 +373,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.'));
        }
 
@@ -384,14 +389,14 @@ 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')]);
 }
 
 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'));
        }
 
@@ -399,7 +404,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.'));
        }
 
@@ -407,14 +412,14 @@ 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')]);
 }
 
 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'));
        }
 
@@ -422,9 +427,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']));
@@ -450,7 +455,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'] = Post\Media::splitAttachments($item_row['uri-id']);
 
        return $item_row;
 }