X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FRelay.php;h=52682241e69c63941ec84610a70445fad4287b7b;hb=4e674d98eb1396f252988e3bde827e850b8a9239;hp=5d7c8b3f70e13a67afe3298296f02c4dc501cf3d;hpb=380cd902d00f0422831e02e96d326f4dc8b711e5;p=friendica.git

diff --git a/src/Console/Relay.php b/src/Console/Relay.php
index 5d7c8b3f70..52682241e6 100644
--- a/src/Console/Relay.php
+++ b/src/Console/Relay.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -47,12 +47,12 @@ 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>
@@ -62,6 +62,7 @@ Description
 		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;
@@ -75,7 +76,7 @@ HELP;
 		$this->dba = $dba;
 	}
 
-	protected function doExecute()
+	protected function doExecute(): int
 	{
 		if ($this->getOption('v')) {
 			$this->out('Executable: ' . $this->executable);
@@ -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` IN (?, ?) AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)",
+				'Application', 'Service', 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) {
@@ -107,7 +108,7 @@ HELP;
 			$actor = $this->getArgument(1);
 
 			$apcontact = APContact::getByURL($actor);
-			if (empty($apcontact) || ($apcontact['type'] != 'Application')) {
+			if (empty($apcontact) || !in_array($apcontact['type'], ['Application', 'Service'])) {
 				$this->out($actor . ' is no relay actor');
 				return 1;
 			}
@@ -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');