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

Raw content is now stored with announce messages as well

Browse source
This commit is contained in:
Michael 2020-03-04 06:04:27 +00:00
parent 79986c1fe5
commit 7b7132971a
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,7 +225,6 @@ class Receiver
if (in_array($type, ['as:Create', 'as:Update', 'as:Announce'])) { if (in_array($type, ['as:Create', 'as:Update', 'as:Announce'])) {
if ($type == 'as:Announce') { if ($type == 'as:Announce') {
$trust_source = false; $trust_source = false;
$push = false;
} }
$object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $uid); $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $uid);
if (empty($object_data)) { if (empty($object_data)) {
@ -234,7 +233,12 @@ class Receiver
} }
$object_data['object_id'] = $object_id; $object_data['object_id'] = $object_id;
if ($type == 'as:Announce') {
$object_data['push'] = false;
} else {
$object_data['push'] = $push; $object_data['push'] = $push;
}
// Test if it is an answer to a mail // Test if it is an answer to a mail
if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) { if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) {
@ -357,7 +361,7 @@ class Receiver
return; return;
} }
if (!empty($body)) { if (!empty($body) && empty($object_data['raw'])) {
$object_data['raw'] = $body; $object_data['raw'] = $body;
} }
@ -395,6 +399,11 @@ class Receiver
$announce_object_data['author'] = JsonLD::fetchElement($activity, 'as:actor', '@id'); $announce_object_data['author'] = JsonLD::fetchElement($activity, 'as:actor', '@id');
$announce_object_data['object_id'] = $object_data['object_id']; $announce_object_data['object_id'] = $object_data['object_id'];
$announce_object_data['object_type'] = $object_data['object_type']; $announce_object_data['object_type'] = $object_data['object_type'];
$announce_object_data['push'] = $push;
if (!empty($body)) {
$announce_object_data['raw'] = $body;
}
ActivityPub\Processor::createActivity($announce_object_data, Activity::ANNOUNCE); ActivityPub\Processor::createActivity($announce_object_data, Activity::ANNOUNCE);
} }