<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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
$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>
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;
$this->dba = $dba;
}
- protected function doExecute()
+ protected function doExecute(): int
{
if ($this->getOption('v')) {
$this->out('Executable: ' . $this->executable);
throw new CommandArgsException('Too many arguments');
}
- if (count($this->args) == 1) {
- throw new CommandArgsException('Too few arguments');
- }
-
- if (count($this->args) == 0) {
- $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]);
- while ($contact = $this->dba->fetch($contacts)) {
+ if ((count($this->args) == 1) && ($this->getArgument(0) == 'list')) {
+ 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) {
+ throw new CommandArgsException($this->getArgument(0) . ' is no valid command');
}
if (count($this->args) == 2) {
$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;
}
$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');