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

Store the raw data in a different way

Browse source
This commit is contained in:
Michael 2020-02-28 09:21:40 +00:00
parent 357c0072bd
commit 26cffd379a
2 changed files with 7 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -448,6 +448,10 @@ class Processor
$item['owner-link'] = $activity['actor']; $item['owner-link'] = $activity['actor'];
$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
if (!empty($activity['raw'])) {
$item['source'] = $activity['raw'];
}
$isForum = false; $isForum = false;
if (!empty($activity['thread-completion'])) { if (!empty($activity['thread-completion'])) {

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

@ -303,33 +303,6 @@ class Receiver
return 0; return 0;
} }
/**
* Store the unprocessed data into the conversation table
* This has to be done outside the regular function,
* since we store everything - not only item posts.
*
* @param array $activity Array with activity data
* @param string $body The raw message
* @throws \Exception
*/
private static function storeConversation($activity, $body)
{
if (empty($body) || empty($activity['id'])) {
return;
}
$conversation = [
'protocol' => Conversation::PARCEL_ACTIVITYPUB,
'item-uri' => $activity['id'],
'reply-to-uri' => $activity['reply-to-id'] ?? '',
'conversation-href' => $activity['context'] ?? '',
'conversation-uri' => $activity['conversation'] ?? '',
'source' => $body,
'received' => DateTimeFormat::utcNow()];
DBA::insert('conversation', $conversation, true);
}
/** /**
* Processes the activity object * Processes the activity object
* *
@ -380,9 +353,9 @@ class Receiver
return; return;
} }
// Only store content related stuff - and no announces, since they possibly overwrite the original content if (!empty($body)) {
if (in_array($object_data['object_type'], self::CONTENT_TYPES) && ($type != 'as:Announce')) { $object_data['raw'] = $body;
self::storeConversation($object_data, $body); $object_data['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
} }
// Internal flag for thread completion. See Processor.php // Internal flag for thread completion. See Processor.php