Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 00:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7284 from annando/fix-fatal

Browse source 
Don't send activities to "null" endpoints
This commit is contained in:
Hypolite Petovan 2019-06-19 23:42:21 -04:00 • committed by GitHub
commit f0849b0a93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Model/APContact.php
View file

@ -87,6 +87,8 @@ class APContact extends BaseObject
return false;
}
$fetched_contact = false;
if (empty($update)) {
if (is_null($update)) {
$ref_update = DateTimeFormat::utc('now - 1 month');
@ -110,24 +112,28 @@ class APContact extends BaseObject
if (!is_null($update)) {
return DBA::isResult($apcontact) ? $apcontact : false;
}
if (DBA::isResult($apcontact)) {
$fetched_contact = $apcontact;
}
}
if (empty(parse_url($url, PHP_URL_SCHEME))) {
$url = self::addrToUrl($url);
if (empty($url)) {
return false;
return $fetched_contact;
}
}
$data = ActivityPub::fetchContent($url);
if (empty($data)) {
return false;
return $fetched_contact;
}
$compacted = JsonLD::compact($data);
if (empty($compacted['@id'])) {
return false;
return $fetched_contact;
}
$apcontact = [];
@ -168,12 +174,12 @@ class APContact extends BaseObject
// Quit if none of the basic values are set
if (empty($apcontact['url']) || empty($apcontact['inbox']) || empty($apcontact['type'])) {
return false;
return $fetched_contact;
}
// Quit if this doesn't seem to be an account at all
if (!in_array($apcontact['type'], ActivityPub::ACCOUNT_TYPES)) {
return false;
return $fetched_contact;
}
$parts = parse_url($apcontact['url']);