Use centralized function to fetch query results

[friendica.git] / src / Module / Item / Ignore.php

diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
index 65617f90f02f1e4f1c5811ea199f49b397185e12..626d6bb508fad6083dbde827d964a1931ab0f495 100644 (file)
--- a/src/Module/Item/Ignore.php
+++ b/src/Module/Item/Ignore.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,7 +25,7 @@ use Friendica\BaseModule;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\DI;
-use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 
 /**
@@ -33,7 +33,7 @@ use Friendica\Network\HTTPException;
  */
 class Ignore extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
                $l10n = DI::l10n();
 
@@ -41,36 +41,25 @@ class Ignore extends BaseModule
                        throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
                }
 
-               $args = DI::args();
-               $dba = DI::dba();
-
-               $message_id = intval($args->get(2));
-
-               if (empty($message_id) || !is_int($message_id)) {
+               if (empty($this->parameters['id'])) {
                        throw new HTTPException\BadRequestException();
                }
 
-               $thread = Item::selectFirstThreadForUser(local_user(), ['uid', 'ignored'], ['iid' => $message_id]);
+               $itemId = intval($this->parameters['id']);
+
+               $dba = DI::dba();
+
+               $thread = Post::selectFirst(['uri-id', 'uid'], ['id' => $itemId, 'gravity' => GRAVITY_PARENT]);
                if (!$dba->isResult($thread)) {
-                       throw new HTTPException\BadRequestException();
+                       throw new HTTPException\NotFoundException();
                }
 
-               // Numeric values are needed for the json output further below
-               $ignored = !empty($thread['ignored']) ? 0 : 1;
+               $ignored = !Post\ThreadUser::getIgnored($thread['uri-id'], local_user());
 
-               switch ($thread['uid'] ?? 0) {
-                       // if the thread is from the current user
-                       case local_user():
-                               $dba->update('thread', ['ignored' => $ignored], ['iid' => $message_id]);
-                               break;
-                       // 0 (null will get transformed to 0) => it's a public post
-                       case 0:
-                               $dba->update('user-item', ['ignored' => $ignored], ['iid' => $message_id, 'uid' => local_user()], true);
-                               break;
-                       // Throws a BadRequestException and not a ForbiddenException on purpose
-                       // Avoids harvesting existing, but forbidden IIDs (security issue)
-                       default:
-                               throw new HTTPException\BadRequestException();
+               if (in_array($thread['uid'], [0, local_user()])) {
+                       Post\ThreadUser::setIgnored($thread['uri-id'], local_user(), $ignored);
+               } else {
+                       throw new HTTPException\BadRequestException();
                }
 
                // See if we've been passed a return path to redirect to
@@ -86,7 +75,13 @@ class Ignore extends BaseModule
                        DI::baseUrl()->redirect($return_path . $rand);
                }
 
-               // the json doesn't really matter, it will either be 0 or 1
-               System::jsonExit($ignored);
+               $return = [
+                       'status'  => 'ok',
+                       'item_id' => $itemId,
+                       'verb'    => 'ignore',
+                       'state'   => $ignored,
+               ];
+
+               System::jsonExit($return);
        }
 }