clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add return value to Model\Contact::addRelationship to remove protocol-specific code from it

Browse Source
This commit is contained in:
Hypolite Petovan
2019-05-19 18:46:29 -04:00
parent 10dfe4347b
commit ea77f214d7
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Protocol/ActivityPub/Processor.php
View File

@@ -542,6 +542,13 @@ class Processor
self::switchContact($item['author-id']);
$result = Contact::addRelationship($owner, $contact, $item, false, $note);
if ($result === false) {
ActivityPub\Transmitter::sendContactReject($item['author-link'], $item['author-id'], $owner['uid']);
return;
}elseif ($result === true) {
ActivityPub\Transmitter::sendContactAccept($item['author-link'], $item['author-id'], $owner['uid']);
}
$cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
return;