Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 06:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

We now directly support the custom emojis from Mastodon

Browse source
This commit is contained in:
Michael 2018-11-07 20:34:03 +00:00
parent 27dd913fcc
commit cd2c7f782f
3 changed files with 59 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -727,13 +727,48 @@ class Receiver
continue;
}
$taglist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type')),
$element = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type')),
'href' => JsonLD::fetchElement($tag, 'as:href'),
'name' => JsonLD::fetchElement($tag, 'as:name')];
if (empty($element['type'])) {
continue;
}
$taglist[] = $element;
}
return $taglist;
}
/**
* Convert emojis from JSON-LD format into a simplified format
*
* @param array $tags Tags in JSON-LD format
*
* @return array with emojis in a simplified format
*/
private static function processEmojis($emojis)
{
$emojilist = [];
if (empty($emojis)) {
return [];
}
foreach ($emojis as $emoji) {
if (empty($emoji) || (JsonLD::fetchElement($emoji, '@type') != 'toot:Emoji') || empty($emoji['as:icon'])) {
continue;
}
$url = JsonLD::fetchElement($emoji['as:icon'], 'as:url');
$element = ['name' => JsonLD::fetchElement($emoji, 'as:name'),
'href' => $url];
$emojilist[] = $element;
}
return $emojilist;
}
/**
* Convert attachments from JSON-LD format into a simplified format
*
@ -821,6 +856,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['generator'] = JsonLD::fetchElement($object, 'as:generator', 'as:name', '@type', 'as:Application');
$object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url');