Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner

[friendica.git] / src / Console / GlobalCommunityBlock.php

diff --git a/src/Console/GlobalCommunityBlock.php b/src/Console/GlobalCommunityBlock.php
index 2eef427dba103d0ada64a328fe634e26b84b058e..39ce6d30149e636564c9930c590f93c10f00ee68 100644 (file)
--- a/src/Console/GlobalCommunityBlock.php
+++ b/src/Console/GlobalCommunityBlock.php
@@ -1,25 +1,49 @@
 <?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\Console;
 
+use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Model\Contact;
 
 /**
- * @brief tool to block an account from the node
+ * tool to block an account from the node
  *
  * With this tool, you can block an account in such a way, that no postings
  * or comments this account writes are accepted to the node.
- *
- * License: AGPLv3 or later, same as Friendica
- *
- * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class GlobalCommunityBlock extends \Asika\SimpleConsole\Console
 {
        protected $helpOptions = ['h', 'help', '?'];
 
+       /**
+        * @var App\Mode
+        */
+       private $appMode;
+       /**
+        * @var \Friendica\Core\L10n
+        */
+       private $l10n;
+
        protected function getHelp()
        {
                $help = <<<HELP
@@ -38,10 +62,16 @@ HELP;
                return $help;
        }
 
-       protected function doExecute()
+       public function __construct(App\Mode $appMode, L10n $l10n, $argv = null)
        {
-               $a = \get_app();
+               parent::__construct($argv);
 
+               $this->appMode = $appMode;
+               $this->l10n = $l10n;
+       }
+
+       protected function doExecute()
+       {
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
                        $this->out('Arguments: ' . var_export($this->args, true));
@@ -57,18 +87,18 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if ($a->getMode()->isInstall()) {
+               if ($this->appMode->isInstall()) {
                        throw new \RuntimeException('Database isn\'t ready or populated yet');
                }
 
-               $contact_url = Contact::getIdForURL($this->getArgument(0));
-               if (!$contact_url) {
-                       throw new \RuntimeException(L10n::t('Could not find any contact entry for this URL (%s)', $this->getArgument(0)));
+               $contact_id = Contact::getIdForURL($this->getArgument(0));
+               if (!$contact_id) {
+                       throw new \RuntimeException($this->l10n->t('Could not find any contact entry for this URL (%s)', $this->getArgument(0)));
                }
 
                $block_reason = $this->getArgument(1);
-               if(Contact::block($contact_url, $block_reason)) {
-                       $this->out(L10n::t('The contact has been blocked from the node'));
+               if(Contact::block($contact_id, $block_reason)) {
+                       $this->out($this->l10n->t('The contact has been blocked from the node'));
                } else {
                        throw new \RuntimeException('The contact block failed.');
                }