clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/2022.09-rc' into pagecache

This commit is contained in:
Michael 2022-09-06 17:36:42 +00:00
parent 6eb9dff807 f0622163b2
commit 7c9f10e58f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1869,8 +1869,10 @@ class Receiver
$object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment', '@value'); $object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment', '@value');
$object_data['diaspora:like'] = JsonLD::fetchElement($object, 'diaspora:like', '@value'); $object_data['diaspora:like'] = JsonLD::fetchElement($object, 'diaspora:like', '@value');
$object_data['actor'] = $object_data['author'] = $actor; $object_data['actor'] = $object_data['author'] = $actor;
$object_data['context'] = JsonLD::fetchElement($object, 'as:context', '@id'); $element = JsonLD::fetchElement($object, 'as:context', '@id');
$object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation', '@id'); $object_data['context'] = $element != './' ? $element : null;
$element = JsonLD::fetchElement($object, 'ostatus:conversation', '@id');
$object_data['conversation'] = $element != './' ? $element : null;
$object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive'); $object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive');
$object_data['name'] = JsonLD::fetchElement($object, 'as:name', '@value'); $object_data['name'] = JsonLD::fetchElement($object, 'as:name', '@value');
$object_data['summary'] = JsonLD::fetchElement($object, 'as:summary', '@value'); $object_data['summary'] = JsonLD::fetchElement($object, 'as:summary', '@value');

5
src/Protocol/ActivityPub/Transmitter.php
View File

@ -1610,7 +1610,10 @@ class Transmitter
$data['url'] = $link ?? $item['plink']; $data['url'] = $link ?? $item['plink'];
$data['attributedTo'] = $item['author-link']; $data['attributedTo'] = $item['author-link'];
$data['sensitive'] = self::isSensitive($item['uri-id']); $data['sensitive'] = self::isSensitive($item['uri-id']);
$data['conversation'] = $data['context'] = ($item['conversation'] ?? '');
if (!empty($item['conversation']) && ($item['conversation'] != './')) {
$data['conversation'] = $data['context'] = $item['conversation'];
}
if (!empty($item['title'])) { if (!empty($item['title'])) {
$data['name'] = BBCode::toPlaintext($item['title'], false); $data['name'] = BBCode::toPlaintext($item['title'], false);