bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Support for transmitting quoted posts

Browse source
This commit is contained in:
Michael 2022-09-29 22:29:15 +00:00
parent 1edcd65e0e
commit 59004711ec
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Protocol/ActivityPub.php
View file

@ -72,6 +72,8 @@ class ActivityPub
'schema' => 'http://schema.org#',
'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
'quoteUrl' => 'as:quoteUrl',
'conversation' => 'ostatus:conversation',
'directMessage' => 'litepub:directMessage',
'discoverable' => 'toot:discoverable',
'PropertyValue' => 'schema:PropertyValue',

39
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1355,11 +1355,12 @@ class Transmitter
/**
* Returns a tag array for a given item array
*
* @param array $item Item array
* @param array $item Item array
* @param string $quote_url Url of the attached quote link
* @return array of tags
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function createTagList(array $item): array
private static function createTagList(array $item, string $quote_url): array
{
$tags = [];
@ -1389,6 +1390,16 @@ class Transmitter
$tags[] = ['type' => 'Mention', 'href' => $announce['actor']['url'], 'name' => '@' . $announce['actor']['addr']];
}
// @see https://codeberg.org/fediverse/fep/src/branch/main/feps/fep-e232.md
if (!empty($quote_url)) {
$tags[] = [
'type' => 'Link',
'mediaType' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'href' => $quote_url,
'name' => BBCode::convertForUriId($item['uri-id'], $quote_url, BBCode::ACTIVITYPUB)
];
}
return $tags;
}
@ -1662,6 +1673,12 @@ class Transmitter
$body = BBCode::setMentionsToNicknames($body);
$shared = BBCode::fetchShareAttributes($body);
if (!empty($shared['link']) && !empty($shared['guid']) && !empty($shared['comment'])) {
$body = self::ReplaceSharedData($body);
$data['quoteUrl'] = $shared['link'];
}
$data['content'] = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);
}
@ -1683,7 +1700,7 @@ class Transmitter
}
$data['attachment'] = self::createAttachmentList($item, $type);
$data['tag'] = self::createTagList($item);
$data['tag'] = self::createTagList($item, $data['quoteUrl'] ?? '');
if (empty($data['location']) && (!empty($item['coord']) || !empty($item['location']))) {
$data['location'] = self::createLocation($item);
@ -1698,6 +1715,22 @@ class Transmitter
return $data;
}
/**
* Replace the share block with a link
*
* @param string $body
* @return string
*/
private static function ReplaceSharedData(string $body): string
{
return BBCode::convertShare(
$body,
function (array $attributes) {
return $attributes['link'];
}
);
}
/**
* Fetches the language from the post, the user or the system.
*