X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FItem%2FIgnore.php;h=626d6bb508fad6083dbde827d964a1931ab0f495;hb=69b7923df2beed71419bc38e61ca9755fad24b12;hp=6a28310b401146e8a4db4f5c749575d8b244a7c5;hpb=b632114b12ec9a160d5442419c21a068c2eb472b;p=friendica.git

diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
index 6a28310b40..626d6bb508 100644
--- a/src/Module/Item/Ignore.php
+++ b/src/Module/Item/Ignore.php
@@ -1,14 +1,31 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module\Item;
 
-use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\L10n\L10n;
 use Friendica\Core\Session;
 use Friendica\Core\System;
-use Friendica\Database\Database;
-use Friendica\Model\Item;
+use Friendica\DI;
+use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 
 /**
@@ -16,47 +33,33 @@ use Friendica\Network\HTTPException;
  */
 class Ignore extends BaseModule
 {
-	public static function rawContent()
+	protected function rawContent(array $request = [])
 	{
-		/** @var L10n $l10n */
-		$l10n = self::getClass(L10n::class);
+		$l10n = DI::l10n();
 
 		if (!Session::isAuthenticated()) {
 			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		/** @var App\Arguments $args */
-		$args = self::getClass(App\Arguments::class);
-		/** @var Database $dba */
-		$dba = self::getClass(Database::class);
-
-		$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
@@ -69,10 +72,16 @@ class Ignore extends BaseModule
 				$rand = "?$rand";
 			}
 
-			self::getApp()->internalRedirect($return_path . $rand);
+			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);
 	}
 }