Merge remote-tracking branch 'upstream/develop' into item-view

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

diff --git a/src/Console/Relay.php b/src/Console/Relay.php
index 8a4c84beff3edb2cf8788ecc6fe57bd30df941bb..f417b51924fa8330ce9c040641a16d869161529b 100644 (file)
--- a/src/Console/Relay.php
+++ b/src/Console/Relay.php
@@ -47,21 +47,22 @@ class Relay extends \Asika\SimpleConsole\Console
                $help = <<<HELP
 console relay - Manage ActivityPub relay configuration
 Synopsis
-       bin/console relay [-h|--help|-?] [-v]
+       bin/console relay list [-h|--help|-?] [-v]
        bin/console relay add <actor> [-h|--help|-?] [-v]
-       bin/console relay remove <actoor> [-h|--help|-?] [-v]
+       bin/console relay remove <actor> [-f|--force] [-h|--help|-?] [-v]
 
 Description
-       bin/console relay
+       bin/console relay list
                Lists all active relay servers
 
        bin/console relay add <actor>
-               Add a relay actor
+               Add a relay actor in the format https://relayserver.tld/actor
 
        bin/console relay remove <actor>
-               Remove a relay actor
+               Remove a relay actor in the format https://relayserver.tld/actor
 
 Options
+    -f|--force   Change the relay status in the system even if the unsubscribe message failed
     -h|--help|-? Show help information
     -v           Show more debug information.
 HELP;
@@ -88,18 +89,18 @@ HELP;
                        throw new CommandArgsException('Too many arguments');
                }
 
-               if (count($this->args) == 1) {
-                       throw new CommandArgsException('Too few arguments');
-               }
-
-               if (count($this->args) == 0) {
+               if ((count($this->args) == 1) && ($this->getArgument(0) == 'list')) {
                        $contacts = $this->dba->select('apcontact', ['url'],
-                       ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))",
-                               'Application', 0, Contact::FOLLOWER, Contact::FRIEND]);
+                       ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)",
+                               'Application', 0, Contact::FRIEND]);
                        while ($contact = $this->dba->fetch($contacts)) {
                                $this->out($contact['url']);
                        }
                        $this->dba->close($contacts);
+               } elseif (count($this->args) == 0) {
+                       throw new CommandArgsException('too few arguments');
+               } elseif (count($this->args) == 1) {
+                       throw new CommandArgsException($this->getArgument(0) . ' is no valid command');
                }
 
                if (count($this->args) == 2) {
@@ -119,10 +120,14 @@ HELP;
                                        $this->out($actor . " couldn't be added");
                                }
                        } elseif ($mode == 'remove') {
-                               if (Transmitter::sendRelayUndoFollow($actor)) {
+                               $force = $this->getOption(['f', 'force'], false);
+
+                               if (Transmitter::sendRelayUndoFollow($actor, $force)) {
                                        $this->out('Successfully removed ' . $actor);
-                               } else {
+                               } elseif (!$force) {
                                        $this->out($actor . " couldn't be removed");
+                               } else {
+                                       $this->out($actor . " is forcefully removed");
                                }
                        } else {
                                throw new CommandArgsException($mode . ' is no valid command');