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

Restore previous state

Browse source
This commit is contained in:
Michael 2020-03-03 22:22:59 +00:00
parent e38640da76
commit 986877b1cf
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Protocol/ActivityPub.php
View file

@ -209,7 +209,7 @@ class ActivityPub
foreach ($items as $activity) { foreach ($items as $activity) {
$ldactivity = JsonLD::compact($activity); $ldactivity = JsonLD::compact($activity);
ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true); ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
} }
} }

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

@ -687,7 +687,7 @@ class Processor
$ldactivity['thread-completion'] = true; $ldactivity['thread-completion'] = true;
ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity)); ActivityPub\Receiver::processActivity($ldactivity);
Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]); Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);
return $activity['id']; return $activity['id'];

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

@ -784,11 +784,7 @@ class Receiver
} }
if (in_array($type, self::CONTENT_TYPES)) { if (in_array($type, self::CONTENT_TYPES)) {
$object_data = self::processObject($object); return self::processObject($object);
if (!empty($data)) {
$object_data['raw'] = json_encode($data);
}
return $object_data;
} }
if ($type == 'as:Announce') { if ($type == 'as:Announce') {