jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9253 from annando/relay-console

Browse source 
Fix a typo / add "list" command to relay cli
This commit is contained in:
Hypolite Petovan 2020-09-21 07:46:51 -04:00 committed by GitHub
commit b8f3c4b065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Console/Relay.php
View file

@ -47,12 +47,12 @@ class Relay extends \Asika\SimpleConsole\Console
$help = <<<HELP $help = <<<HELP
console relay - Manage ActivityPub relay configuration console relay - Manage ActivityPub relay configuration
Synopsis 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 add <actor> [-h|--help|-?] [-v]
bin/console relay remove <actoor> [-h|--help|-?] [-v] bin/console relay remove <actor> [-h|--help|-?] [-v]
Description Description
bin/console relay bin/console relay list
Lists all active relay servers Lists all active relay servers
bin/console relay add <actor> bin/console relay add <actor>
@ -88,11 +88,7 @@ HELP;
throw new CommandArgsException('Too many arguments'); throw new CommandArgsException('Too many arguments');
} }
if (count($this->args) == 1) { if ((count($this->args) == 1) && ($this->getArgument(0) == 'list')) {
throw new CommandArgsException('Too few arguments');
}
if (count($this->args) == 0) {
$contacts = $this->dba->select('apcontact', ['url'], $contacts = $this->dba->select('apcontact', ['url'],
["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))", ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))",
'Application', 0, Contact::FOLLOWER, Contact::FRIEND]); 'Application', 0, Contact::FOLLOWER, Contact::FRIEND]);
@ -100,6 +96,10 @@ HELP;
$this->out($contact['url']); $this->out($contact['url']);
} }
$this->dba->close($contacts); $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) { if (count($this->args) == 2) {