Merge pull request #8263 from annando/remote-follow

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

diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
index 662148076ca6d32eefdde1f82607cd2c9902e754..65617f90f02f1e4f1c5811ea199f49b397185e12 100644 (file)
--- a/src/Module/Item/Ignore.php
+++ b/src/Module/Item/Ignore.php
@@ -1,13 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\DI;
 use Friendica\Model\Item;
 use Friendica\Network\HTTPException;
 
@@ -16,19 +33,16 @@ use Friendica\Network\HTTPException;
  */
 class Ignore extends BaseModule
 {
-       public static function rawContent($parameters)
+       public static function rawContent(array $parameters = [])
        {
-               /** @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);
+               $args = DI::args();
+               $dba = DI::dba();
 
                $message_id = intval($args->get(2));
 
@@ -69,10 +83,10 @@ 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]);
+               System::jsonExit($ignored);
        }
 }