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

Merge pull request #9526 from MrPetovan/bug/9525-mastodon-emojis-tag 

Restore expected implementation of JsonLD::fetchElementArray
This commit is contained in:
Michael Vogel 2020-11-12 05:47:46 +01:00 committed by GitHub
parent d7ea4ea425 a8f16788f4
commit acae3df0a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Protocol/ActivityPub/Processor.php
View File

@ -75,10 +75,15 @@ class Processor
*/
private static function replaceEmojis($body, array $emojis)
{
foreach ($emojis as $emoji) {
$replace = '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
$body = str_replace($emoji['name'], $replace, $body);
}
$body = strtr($body,
array_combine(
array_column($emojis, 'name'),
array_map(function ($emoji) {
return '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
}, $emojis)
)
);
return $body;
}

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

@ -1345,7 +1345,7 @@ class Receiver
$object_data['longitude'] = JsonLD::fetchElement($object_data, 'longitude', '@value');
$object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment') ?? []);
$object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag') ?? []);
$object_data['emojis'] = self::processEmojis(JsonLD::fetchElementArray($object, 'as:tag', 'toot:Emoji') ?? []);
$object_data['emojis'] = self::processEmojis(JsonLD::fetchElementArray($object, 'as:tag', null, '@type', 'toot:Emoji') ?? []);
$object_data['generator'] = JsonLD::fetchElement($object, 'as:generator', 'as:name', '@type', 'as:Application');
$object_data['generator'] = JsonLD::fetchElement($object_data, 'generator', '@value');
$object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url', '@id');

14
src/Util/JsonLD.php
View File

@ -173,7 +173,7 @@ class JsonLD
*
* @return array fetched element
*/
public static function fetchElementArray($array, $element, $key = null)
public static function fetchElementArray($array, $element, $key = null, $type = null, $type_value = null)
{
if (!isset($array[$element])) {
return null;
@ -187,10 +187,14 @@ class JsonLD
$elements = [];
foreach ($array[$element] as $entry) {
if (!is_array($entry) || (is_null($key) && is_array($entry))) {
$elements[] = $entry;
} elseif (!is_null($key) && isset($entry[$key])) {
$elements[] = $entry[$key];
if (!is_array($entry) || is_null($key)) {
$item = $entry;
} elseif (isset($entry[$key])) {
$item = $entry[$key];
}
if (isset($item) && (is_null($type) || is_null($type_value) || isset($item[$type]) && $item[$type] == $type_value)) {
$elements[] = $item;
}
}

12
tests/src/Util/JsonLDTest.php
View File

@ -62,6 +62,7 @@ class JsonLDTest extends TestCase
$data = JsonLD::fetchElementArray($object, 'field', '@id');
self::assertSame(['value3', 'value4'], $data);
}
public function testFetchElementArrayFoundArrays()
{
$object = ['field' => [['subfield11' => 'value11', 'subfield12' => 'value12'],
@ -74,6 +75,17 @@ class JsonLDTest extends TestCase
self::assertSame($expect, $data);
}
public function testFetchElementArrayTypeValue()
{
$object = ['field' => [['subfield11' => 'value11', 'subfield12' => 'value12'],
['subfield21' => 'value21', 'subfield22' => 'value22']]];
$expect = [['subfield11' => 'value11', 'subfield12' => 'value12']];
$data = JsonLD::fetchElementArray($object, 'field', null, 'subfield11', 'value11');
self::assertSame($expect, $data);
}
public function testFetchElementNotFound()
{
$object = [];