X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FRelay.php;h=11d1dbf8215a9871dbc4ffae535d8904a3f1ff94;hb=d4a5a8051ad34a7be72238967afb3e6b140afdc8;hp=f417b51924fa8330ce9c040641a16d869161529b;hpb=d666b6cb42a1b0d46e9fae914a803fbd5e10e2ab;p=friendica.git

diff --git a/src/Console/Relay.php b/src/Console/Relay.php
index f417b51924..11d1dbf821 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
  *
@@ -23,8 +23,8 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\Model\APContact;
-use Friendica\Model\Contact;
 use Friendica\Protocol\ActivityPub\Transmitter;
+use Friendica\Protocol\Relay as ProtocolRelay;
 
 /**
  * tool to control the list of ActivityPub relay servers from the CLI
@@ -76,7 +76,7 @@ HELP;
 		$this->dba = $dba;
 	}
 
-	protected function doExecute()
+	protected function doExecute(): int
 	{
 		if ($this->getOption('v')) {
 			$this->out('Executable: ' . $this->executable);
@@ -90,13 +90,9 @@ HELP;
 		}
 
 		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` = ?)",
-				'Application', 0, Contact::FRIEND]);
-			while ($contact = $this->dba->fetch($contacts)) {
+			foreach (ProtocolRelay::getList(['url']) as $contact) {
 				$this->out($contact['url']);
 			}
-			$this->dba->close($contacts);
 		} elseif (count($this->args) == 0) {
 			throw new CommandArgsException('too few arguments');
 		} elseif (count($this->args) == 1) {
@@ -108,7 +104,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;
 			}