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

owner is now actor

Browse source
This commit is contained in:
Michael 2018-10-07 17:35:43 +00:00
parent 616c4a89bd
commit 1efca1b75d
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -178,7 +178,7 @@ class Receiver
$object_data = self::addActivityFields($object_data, $ldactivity);
$object_data['type'] = $type;
$object_data['owner'] = $actor;
$object_data['actor'] = $actor;
$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
logger('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], LOGGER_DEBUG);
@ -609,7 +609,7 @@ class Receiver
$object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid');
$object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment');
$object_data['owner'] = $object_data['author'] = $actor;
$object_data['actor'] = $object_data['author'] = $actor;
$object_data['context'] = JsonLD::fetchElement($object, 'as:context');
$object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation');
$object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive');
@ -633,7 +633,7 @@ class Receiver
}
}
$object_data['receiver'] = self::getReceivers($object, $object_data['owner']);
$object_data['receiver'] = self::getReceivers($object, $object_data['actor']);
// Common object data: