nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6966 from annando/ap-announce

Browse source 
AP: Incoming announces are now stored as activities
This commit is contained in:
Hypolite Petovan 2019-04-02 19:35:56 -04:00 committed by GitHub
parent 76ecf67066 e66e2adf5f
commit d607d81183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Protocol/ActivityPub/Receiver.php
View file

@ -206,6 +206,8 @@ class Receiver
Logger::log("Object data couldn't be processed", Logger::DEBUG); Logger::log("Object data couldn't be processed", Logger::DEBUG);
return []; return [];
} }
$object_data['object_id'] = $object_id;
// We had been able to retrieve the object data - so we can trust the source // We had been able to retrieve the object data - so we can trust the source
$trust_source = true; $trust_source = true;
} elseif (in_array($type, ['as:Like', 'as:Dislike']) || } elseif (in_array($type, ['as:Like', 'as:Dislike']) ||
@ -352,12 +354,34 @@ class Receiver
switch ($type) { switch ($type) {
case 'as:Create': case 'as:Create':
case 'as:Announce':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createItem($object_data); ActivityPub\Processor::createItem($object_data);
} }
break; break;
case 'as:Announce':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
$profile = APContact::getByURL($object_data['actor']);
if ($profile['type'] == 'Person') {
// Reshared posts from persons appear as summary at the bottom
// If this isn't set, then a single reshare appears on top. This is used for groups.
$object_data['thread-completion'] = true;
}
ActivityPub\Processor::createItem($object_data);
// Add the bottom reshare information only for persons
if ($profile['type'] == 'Person') {
$announce_object_data = self::processObject($activity);
$announce_object_data['name'] = $type;
$announce_object_data['author'] = JsonLD::fetchElement($activity, 'as:actor');
$announce_object_data['object_id'] = $object_data['object_id'];
$announce_object_data['object_type'] = $object_data['object_type'];
ActivityPub\Processor::createActivity($announce_object_data, ACTIVITY2_ANNOUNCE);
}
}
break;
case 'as:Like': case 'as:Like':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, ACTIVITY_LIKE); ActivityPub\Processor::createActivity($object_data, ACTIVITY_LIKE);