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

Merge branch 'send-relais' of github.com:annando/friendica into send-relais

Browse source
This commit is contained in:
Michael 2020-09-16 18:25:13 +00:00
commit 373ba425ae
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/tools.md
View file

@ -27,7 +27,7 @@ The console provides the following commands:
* typo: Checks for parse errors in Friendica files * typo: Checks for parse errors in Friendica files
* postupdate: Execute pending post update scripts (can last days) * postupdate: Execute pending post update scripts (can last days)
* storage: Manage storage backend * storage: Manage storage backend
* relay: Manage ActivityPub relais * relay: Manage ActivityPub relay servers
Please consult *bin/console help* on the command line interface of your server for details about the commands. Please consult *bin/console help* on the command line interface of your server for details about the commands.

17
src/Console/Relay.php
View file

@ -69,12 +69,12 @@ Synopsis
Description Description
bin/console relay bin/console relay
Lists all active relais Lists all active relay servers
bin/console relay add <actor> bin/console relay add <actor>
Add a relay actor Add a relay actor
bin/console relay remove <actoor> bin/console relay remove <actor>
Remove a relay actor Remove a relay actor
Options Options
@ -84,11 +84,14 @@ HELP;
return $help; return $help;
} }
public function __construct(App\Mode $appMode, array $argv = null) /** @var $dba Friendica\Database\Database */
private $dba;
public function __construct(Friendica\Database\Database $dba, array $argv = null)
{ {
parent::__construct($argv); parent::__construct($argv);
$this->appMode = $appMode; $this->dba = $dba;
} }
protected function doExecute() protected function doExecute()
@ -109,13 +112,13 @@ HELP;
} }
if (count($this->args) == 0) { if (count($this->args) == 0) {
$contacts = 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]);
while ($contact = DBA::fetch($contacts)) { while ($contact = $this->dba->fetch($contacts)) {
$this->out($contact['url']); $this->out($contact['url']);
} }
DBA::close($contacts); $this->dba->close($contacts);
} }
if (count($this->args) == 2) { if (count($this->args) == 2) {