Merge pull request #13893 from annando/fix-relay-unsubscribe
Fixed relay detection on unsubscription
This commit is contained in:
commit
262ca4131d
|
@ -104,12 +104,17 @@ HELP;
|
||||||
$actor = $this->getArgument(1);
|
$actor = $this->getArgument(1);
|
||||||
|
|
||||||
$apcontact = APContact::getByURL($actor);
|
$apcontact = APContact::getByURL($actor);
|
||||||
if (empty($apcontact) || !in_array($apcontact['type'], ['Application', 'Service'])) {
|
if (empty($apcontact)) {
|
||||||
$this->out($actor . ' is no relay actor');
|
$this->out($actor . ' wasn\'t found');
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($mode == 'add') {
|
if ($mode == 'add') {
|
||||||
|
if (!APContact::isRelay($apcontact)) {
|
||||||
|
$this->out($actor . ' is no relay actor');
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
if (Transmitter::sendRelayFollow($actor)) {
|
if (Transmitter::sendRelayFollow($actor)) {
|
||||||
$this->out('Successfully added ' . $actor);
|
$this->out('Successfully added ' . $actor);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user