Creating interfaces for Config/PConfig & fix tests

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

diff --git a/src/Console/GlobalCommunityBlock.php b/src/Console/GlobalCommunityBlock.php
index bc067dada61d3dc6db48c41d880d269453801ac2..1789b66d9ca58378c172e37dc485a5c0a5f95d2d 100644 (file)
--- a/src/Console/GlobalCommunityBlock.php
+++ b/src/Console/GlobalCommunityBlock.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Console;
 
+use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Model\Contact;
 
@@ -20,15 +21,25 @@ class GlobalCommunityBlock extends \Asika\SimpleConsole\Console
 {
        protected $helpOptions = ['h', 'help', '?'];
 
+       /**
+        * @var App\Mode
+        */
+       private $appMode;
+       /**
+        * @var L10n\L10n
+        */
+       private $l10n;
+
        protected function getHelp()
        {
                $help = <<<HELP
 console globalcommunityblock - Block remote profile from interacting with this node
 Usage
-       bin/console globalcommunityblock <profile_url> [-h|--help|-?] [-v]
+       bin/console globalcommunityblock <profile_url> [<reason>] [-h|--help|-?] [-v]
 
 Description
        Blocks an account in such a way that no postings or comments this account writes are accepted to this node.
+       You can provide a optional reason for the block.
 
 Options
     -h|--help|-? Show help information
@@ -37,10 +48,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));
@@ -52,20 +69,22 @@ HELP;
                        return 0;
                }
 
-               if (count($this->args) > 1) {
+               if (count($this->args) > 2) {
                        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_id = Contact::getIdForURL($this->getArgument(0));
                if (!$contact_id) {
-                       throw new \RuntimeException(L10n::t('Could not find any contact entry for this URL (%s)', $this->getArgument(0)));
+                       throw new \RuntimeException($this->l10n->t('Could not find any contact entry for this URL (%s)', $this->getArgument(0)));
                }
-               if(Contact::block($contact_id)) {
-                       $this->out(L10n::t('The contact has been blocked from the node'));
+
+               $block_reason = $this->getArgument(1);
+               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.');
                }