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

Merge pull request #7398 from annando/fetch-posts

Browse source 
Preparation for being able to fetch AP posts by proving the URL
This commit is contained in:
Hypolite Petovan 2019-07-17 16:01:19 -04:00 committed by GitHub
commit 4fc3eb8f06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Protocol/ActivityPub/Processor.php
View file

@ -522,13 +522,17 @@ class Processor
* @param $child * @param $child
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private static function fetchMissingActivity($url, $child) public static function fetchMissingActivity($url, $child = [])
{ {
if (Config::get('system', 'ostatus_full_threads')) { if (Config::get('system', 'ostatus_full_threads')) {
return; return;
} }
$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']); if (!empty($child['receiver'])) {
$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
} else {
$uid = 0;
}
$object = ActivityPub::fetchContent($url, $uid); $object = ActivityPub::fetchContent($url, $uid);
if (empty($object)) { if (empty($object)) {
@ -541,15 +545,34 @@ class Processor
return; return;
} }
if (!empty($child['author'])) {
$actor = $child['author'];
} elseif (!empty($object['actor'])) {
$actor = $object['actor'];
} elseif (!empty($object['attributedTo'])) {
$actor = $object['attributedTo'];
} else {
// Shouldn't happen
$actor = '';
}
if (!empty($object['published'])) {
$published = $object['published'];
} elseif (!empty($child['published'])) {
$published = $child['published'];
} else {
$published = DateTimeFormat::utcNow();
}
$activity = []; $activity = [];
$activity['@context'] = $object['@context']; $activity['@context'] = $object['@context'];
unset($object['@context']); unset($object['@context']);
$activity['id'] = $object['id']; $activity['id'] = $object['id'];
$activity['to'] = defaults($object, 'to', []); $activity['to'] = defaults($object, 'to', []);
$activity['cc'] = defaults($object, 'cc', []); $activity['cc'] = defaults($object, 'cc', []);
$activity['actor'] = $child['author']; $activity['actor'] = $actor;
$activity['object'] = $object; $activity['object'] = $object;
$activity['published'] = defaults($object, 'published', $child['published']); $activity['published'] = $published;
$activity['type'] = 'Create'; $activity['type'] = 'Create';
$ldactivity = JsonLD::compact($activity); $ldactivity = JsonLD::compact($activity);