Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 19:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved handling of native quotes

Browse source
This commit is contained in:
Michael 2022-10-29 22:11:39 +00:00
parent f418687a71
commit 3c169b534e
11 changed files with 204 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -827,10 +827,26 @@ class Processor
$content = self::addMentionLinks($content, $activity['tags']);
if (!empty($activity['quote-url'])) {
$id = Item::fetchByLink($activity['quote-url']);
if ($id) {
$shared_item = Post::selectFirst(['uri-id'], ['id' => $id]);
$item['quote-uri-id'] = $shared_item['uri-id'];
} else {
Logger::info('Quote was not fetched', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]);
}
}
if (!empty($activity['source'])) {
$item['body'] = $activity['source'];
$item['raw-body'] = $content;
$item['body'] = DI::contentItem()->improveSharedDataInBody($item);
$quote_uri_id = Item::getQuoteUriId($item['body']);
if (empty($item['quote-uri-id']) && !empty($quote_uri_id)) {
$item['quote-uri-id'] = $quote_uri_id;
}
$item['body'] = BBCode::removeSharedData($item['body']);
} else {
$parent_uri = $item['parent-uri'] ?? $item['thr-parent'];
if (empty($activity['directmessage']) && ($parent_uri != $item['uri']) && ($item['gravity'] == Item::GRAVITY_COMMENT)) {
@ -848,10 +864,6 @@ class Processor
}
$item['content-warning'] = HTML::toBBCode($activity['summary'] ?? '');
$item['raw-body'] = $item['body'] = $content;
if (!empty($activity['quote-url'])) {
$item['body'] .= DI::contentItem()->createSharedPostByUrl($activity['quote-url']);
}
}
self::storeFromBody($item);