X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FReceiver.php;h=7fe1f128f496b746efbed1bd24ccf854964913d6;hb=5abc22f6c536b4fea7a5becd53561959ba0e7512;hp=5e6269472a7c54b46fbeb3b7f268e0182e2ba01f;hpb=68af56a10e41b7a3cc6e8b6996114a21c4c83081;p=friendica.git diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 5e6269472a..7fe1f128f4 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -5,24 +5,24 @@ namespace Friendica\Protocol\ActivityPub; use Friendica\Database\DBA; -use Friendica\Util\HTTPSignature; +use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Model\Contact; use Friendica\Model\APContact; +use Friendica\Model\Conversation; use Friendica\Model\Item; use Friendica\Model\User; -use Friendica\Util\JsonLD; -use Friendica\Util\LDSignature; use Friendica\Protocol\ActivityPub; -use Friendica\Model\Conversation; use Friendica\Util\DateTimeFormat; +use Friendica\Util\HTTPSignature; +use Friendica\Util\JsonLD; +use Friendica\Util\LDSignature; +use Friendica\Util\Strings; /** * @brief ActivityPub Receiver Protocol class * * To-Do: - * - Update (Image, Video, Article, Note) - * - Event * - Undo Announce * * Check what this is meant to do: @@ -31,13 +31,12 @@ use Friendica\Util\DateTimeFormat; * - Flag * - Remove * - Undo Block - * - Undo Accept (Problem: This could invert a contact accept or an event accept) */ class Receiver { const PUBLIC_COLLECTION = 'as:Public'; const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application']; - const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image']; + const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event']; const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept']; /** @@ -62,16 +61,16 @@ class Receiver { $http_signer = HTTPSignature::getSigner($body, $header); if (empty($http_signer)) { - logger('Invalid HTTP signature, message will be discarded.', LOGGER_DEBUG); + Logger::log('Invalid HTTP signature, message will be discarded.', Logger::DEBUG); return; } else { - logger('HTTP signature is signed by ' . $http_signer, LOGGER_DEBUG); + Logger::log('HTTP signature is signed by ' . $http_signer, Logger::DEBUG); } $activity = json_decode($body, true); if (empty($activity)) { - logger('Invalid body.', LOGGER_DEBUG); + Logger::log('Invalid body.', Logger::DEBUG); return; } @@ -79,31 +78,31 @@ class Receiver $actor = JsonLD::fetchElement($ldactivity, 'as:actor'); - logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG); + Logger::log('Message for user ' . $uid . ' is from actor ' . $actor, Logger::DEBUG); if (LDSignature::isSigned($activity)) { $ld_signer = LDSignature::getSigner($activity); if (empty($ld_signer)) { - logger('Invalid JSON-LD signature from ' . $actor, LOGGER_DEBUG); + Logger::log('Invalid JSON-LD signature from ' . $actor, Logger::DEBUG); } if (!empty($ld_signer && ($actor == $http_signer))) { - logger('The HTTP and the JSON-LD signature belong to ' . $ld_signer, LOGGER_DEBUG); + Logger::log('The HTTP and the JSON-LD signature belong to ' . $ld_signer, Logger::DEBUG); $trust_source = true; } elseif (!empty($ld_signer)) { - logger('JSON-LD signature is signed by ' . $ld_signer, LOGGER_DEBUG); + Logger::log('JSON-LD signature is signed by ' . $ld_signer, Logger::DEBUG); $trust_source = true; } elseif ($actor == $http_signer) { - logger('Bad JSON-LD signature, but HTTP signer fits the actor.', LOGGER_DEBUG); + Logger::log('Bad JSON-LD signature, but HTTP signer fits the actor.', Logger::DEBUG); $trust_source = true; } else { - logger('Invalid JSON-LD signature and the HTTP signer is different.', LOGGER_DEBUG); + Logger::log('Invalid JSON-LD signature and the HTTP signer is different.', Logger::DEBUG); $trust_source = false; } } elseif ($actor == $http_signer) { - logger('Trusting post without JSON-LD signature, The actor fits the HTTP signer.', LOGGER_DEBUG); + Logger::log('Trusting post without JSON-LD signature, The actor fits the HTTP signer.', Logger::DEBUG); $trust_source = true; } else { - logger('No JSON-LD signature, different actor.', LOGGER_DEBUG); + Logger::log('No JSON-LD signature, different actor.', Logger::DEBUG); $trust_source = false; } @@ -113,17 +112,19 @@ class Receiver /** * Fetches the object type for a given object id * - * @param array $activity - * @param string $object_id Object ID of the the provided object + * @param array $activity + * @param string $object_id Object ID of the the provided object + * @param integer $uid User ID * * @return string with object type */ - private static function fetchObjectType($activity, $object_id) + private static function fetchObjectType($activity, $object_id, $uid = 0) { - - $object_type = JsonLD::fetchElement($activity['as:object'], '@type'); - if (!empty($object_type)) { - return $object_type; + if (!empty($activity['as:object'])) { + $object_type = JsonLD::fetchElement($activity['as:object'], '@type'); + if (!empty($object_type)) { + return $object_type; + } } if (Item::exists(['uri' => $object_id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]])) { @@ -136,7 +137,7 @@ class Receiver return 'as:' . $profile['type']; } - $data = ActivityPub::fetchContent($object_id); + $data = ActivityPub::fetchContent($object_id, $uid); if (!empty($data)) { $object = JsonLD::compact($data); $type = JsonLD::fetchElement($object, '@type'); @@ -161,7 +162,7 @@ class Receiver { $actor = JsonLD::fetchElement($activity, 'as:actor'); if (empty($actor)) { - logger('Empty actor', LOGGER_DEBUG); + Logger::log('Empty actor', Logger::DEBUG); return []; } @@ -172,29 +173,32 @@ class Receiver // When it is a delivery to a personal inbox we add that user to the receivers if (!empty($uid)) { - $owner = User::getOwnerDataById($uid); $additional = ['uid:' . $uid => $uid]; $receivers = array_merge($receivers, $additional); + } else { + // We possibly need some user to fetch private content, + // so we fetch the first out ot the list. + $uid = self::getFirstUserFromReceivers($receivers); } - logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG); + Logger::log('Receivers: ' . $uid . ' - ' . json_encode($receivers), Logger::DEBUG); $object_id = JsonLD::fetchElement($activity, 'as:object'); if (empty($object_id)) { - logger('No object found', LOGGER_DEBUG); + Logger::log('No object found', Logger::DEBUG); return []; } - $object_type = self::fetchObjectType($activity, $object_id); + $object_type = self::fetchObjectType($activity, $object_id, $uid); // Fetch the content only on activities where this matters - if (in_array($type, ['as:Create', 'as:Announce'])) { + if (in_array($type, ['as:Create', 'as:Update', 'as:Announce'])) { if ($type == 'as:Announce') { $trust_source = false; } - $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source); + $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $uid); if (empty($object_data)) { - logger("Object data couldn't be processed", LOGGER_DEBUG); + Logger::log("Object data couldn't be processed", Logger::DEBUG); return []; } // We had been able to retrieve the object data - so we can trust the source @@ -214,6 +218,11 @@ class Receiver $object_data['object_actor'] = JsonLD::fetchElement($activity['as:object'], 'as:actor'); $object_data['object_object'] = JsonLD::fetchElement($activity['as:object'], 'as:object'); $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type'); + + // An Undo is done on the object of an object, so we need that type as well + if ($type == 'as:Undo') { + $object_data['object_object_type'] = self::fetchObjectType([], $object_data['object_object'], $uid); + } } $object_data = self::addActivityFields($object_data, $activity); @@ -226,11 +235,27 @@ class Receiver $object_data['actor'] = $actor; $object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers); - logger('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], LOGGER_DEBUG); + Logger::log('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], Logger::DEBUG); return $object_data; } + /** + * Fetches the first user id from the receiver array + * + * @param array $receivers Array with receivers + * @return integer user id; + */ + public static function getFirstUserFromReceivers($receivers) + { + foreach ($receivers as $receiver) { + if (!empty($receiver)) { + return $receiver; + } + } + return 0; + } + /** * Store the unprocessed data into the conversation table * This has to be done outside the regular function, @@ -269,30 +294,40 @@ class Receiver { $type = JsonLD::fetchElement($activity, '@type'); if (!$type) { - logger('Empty type', LOGGER_DEBUG); + Logger::log('Empty type', Logger::DEBUG); return; } if (!JsonLD::fetchElement($activity, 'as:object')) { - logger('Empty object', LOGGER_DEBUG); + Logger::log('Empty object', Logger::DEBUG); return; } if (!JsonLD::fetchElement($activity, 'as:actor')) { - logger('Empty actor', LOGGER_DEBUG); + Logger::log('Empty actor', Logger::DEBUG); return; } + // Don't trust the source if "actor" differs from "attributedTo". The content could be forged. + if ($trust_source && ($type == 'as:Create') && is_array($activity['as:object'])) { + $actor = JsonLD::fetchElement($activity, 'as:actor'); + $attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo'); + $trust_source = ($actor == $attributed_to); + if (!$trust_source) { + Logger::log('Not trusting actor: ' . $actor . '. It differs from attributedTo: ' . $attributed_to, Logger::DEBUG); + } + } + // $trust_source is called by reference and is set to true if the content was retrieved successfully $object_data = self::prepareObjectData($activity, $uid, $trust_source); if (empty($object_data)) { - logger('No object data found', LOGGER_DEBUG); + Logger::log('No object data found', Logger::DEBUG); return; } if (!$trust_source) { - logger('No trust for activity type "' . $type . '", so we quit now.', LOGGER_DEBUG); + Logger::log('No trust for activity type "' . $type . '", so we quit now.', Logger::DEBUG); return; } @@ -306,20 +341,32 @@ class Receiver switch ($type) { case 'as:Create': case 'as:Announce': - ActivityPub\Processor::createItem($object_data); + if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { + ActivityPub\Processor::createItem($object_data); + } break; case 'as:Like': - ActivityPub\Processor::likeItem($object_data); + if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { + ActivityPub\Processor::createActivity($object_data, ACTIVITY_LIKE); + } break; case 'as:Dislike': - ActivityPub\Processor::dislikeItem($object_data); + if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { + ActivityPub\Processor::createActivity($object_data, ACTIVITY_DISLIKE); + } + break; + + case 'as:TentativeAccept': + if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { + ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTENDMAYBE); + } break; case 'as:Update': if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { - /// @todo + ActivityPub\Processor::updateItem($object_data); } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) { ActivityPub\Processor::updatePerson($object_data, $body); } @@ -334,31 +381,42 @@ class Receiver break; case 'as:Follow': - ActivityPub\Processor::followUser($object_data); + if (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) { + ActivityPub\Processor::followUser($object_data); + } break; case 'as:Accept': if ($object_data['object_type'] == 'as:Follow') { ActivityPub\Processor::acceptFollowUser($object_data); + } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) { + ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTEND); } break; case 'as:Reject': if ($object_data['object_type'] == 'as:Follow') { ActivityPub\Processor::rejectFollowUser($object_data); + } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) { + ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTENDNO); } break; case 'as:Undo': - if ($object_data['object_type'] == 'as:Follow') { + if (($object_data['object_type'] == 'as:Follow') && + in_array($object_data['object_object_type'], self::ACCOUNT_TYPES)) { ActivityPub\Processor::undoFollowUser($object_data); - } elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) { + } elseif (($object_data['object_type'] == 'as:Accept') && + in_array($object_data['object_object_type'], self::ACCOUNT_TYPES)) { + ActivityPub\Processor::rejectFollowUser($object_data); + } elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES) && + in_array($object_data['object_object_type'], self::CONTENT_TYPES)) { ActivityPub\Processor::undoActivity($object_data); } break; default: - logger('Unknown activity: ' . $type, LOGGER_DEBUG); + Logger::log('Unknown activity: ' . $type . ' ' . $object_data['object_type'], Logger::DEBUG); break; } } @@ -368,10 +426,11 @@ class Receiver * * @param array $activity * @param string $actor + * @param array $tags * * @return array with receivers (user id) */ - private static function getReceivers($activity, $actor) + private static function getReceivers($activity, $actor, $tags = []) { $receivers = []; @@ -388,9 +447,9 @@ class Receiver $profile = APContact::getByURL($actor); $followers = defaults($profile, 'followers', ''); - logger('Actor: ' . $actor . ' - Followers: ' . $followers, LOGGER_DEBUG); + Logger::log('Actor: ' . $actor . ' - Followers: ' . $followers, Logger::DEBUG); } else { - logger('Empty actor', LOGGER_DEBUG); + Logger::log('Empty actor', Logger::DEBUG); $followers = ''; } @@ -407,7 +466,7 @@ class Receiver if (($receiver == self::PUBLIC_COLLECTION) && !empty($actor)) { // This will most likely catch all OStatus connections to Mastodon - $condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND] + $condition = ['alias' => [$actor, Strings::normaliseLink($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND] , 'archive' => false, 'pending' => false]; $contacts = DBA::select('contact', ['uid'], $condition); while ($contact = DBA::fetch($contacts)) { @@ -419,23 +478,34 @@ class Receiver } if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) { - $condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND], - 'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false]; - $contacts = DBA::select('contact', ['uid'], $condition); - while ($contact = DBA::fetch($contacts)) { - if ($contact['uid'] != 0) { - $receivers['uid:' . $contact['uid']] = $contact['uid']; - } - } - DBA::close($contacts); + $receivers = array_merge($receivers, self::getReceiverForActor($actor, $tags)); continue; } - $condition = ['self' => true, 'nurl' => normalise_link($receiver)]; - $contact = DBA::selectFirst('contact', ['uid'], $condition); + // Fetching all directly addressed receivers + $condition = ['self' => true, 'nurl' => Strings::normaliseLink($receiver)]; + $contact = DBA::selectFirst('contact', ['uid', 'contact-type'], $condition); if (!DBA::isResult($contact)) { continue; } + + // Check if the potential receiver is following the actor + // Exception: The receiver is targetted via "to" or this is a comment + if ((($element != 'as:to') && empty($replyto)) || ($contact['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY)) { + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; + $condition = ['nurl' => Strings::normaliseLink($actor), 'rel' => [Contact::SHARING, Contact::FRIEND], + 'network' => $networks, 'archive' => false, 'pending' => false, 'uid' => $contact['uid']]; + + // Forum posts are only accepted from forum contacts + if ($contact['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) { + $condition['rel'] = [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER]; + } + + if (!DBA::exists('contact', $condition)) { + continue; + } + } + $receivers['uid:' . $contact['uid']] = $contact['uid']; } } @@ -445,6 +515,71 @@ class Receiver return $receivers; } + /** + * Fetch the receiver list of a given actor + * + * @param string $actor + * @param array $tags + * + * @return array with receivers (user id) + */ + public static function getReceiverForActor($actor, $tags) + { + $receivers = []; + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; + $condition = ['nurl' => Strings::normaliseLink($actor), 'rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER], + 'network' => $networks, 'archive' => false, 'pending' => false]; + $contacts = DBA::select('contact', ['uid', 'rel'], $condition); + while ($contact = DBA::fetch($contacts)) { + if (self::isValidReceiverForActor($contact, $actor, $tags)) { + $receivers['uid:' . $contact['uid']] = $contact['uid']; + } + } + DBA::close($contacts); + return $receivers; + } + + /** + * Tests if the contact is a valid receiver for this actor + * + * @param array $contact + * @param string $actor + * @param array $tags + * + * @return array with receivers (user id) + */ + private static function isValidReceiverForActor($contact, $actor, $tags) + { + // Public contacts are no valid receiver + if ($contact['uid'] == 0) { + return false; + } + + // Are we following the contact? Then this is a valid receiver + if (in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND])) { + return true; + } + + // When the possible receiver isn't a community, then it is no valid receiver + $owner = User::getOwnerDataById($contact['uid']); + if (empty($owner) || ($owner['contact-type'] != Contact::ACCOUNT_TYPE_COMMUNITY)) { + return false; + } + + // Is the community account tagged? + foreach ($tags as $tag) { + if ($tag['type'] != 'Mention') { + continue; + } + + if ($tag['href'] == $owner['url']) { + return true; + } + } + + return false; + } + /** * Switches existing contacts to ActivityPub * @@ -459,13 +594,14 @@ class Receiver return; } - logger('Switch contact ' . $cid . ' (' . $profile['url'] . ') for user ' . $uid . ' to ActivityPub'); + Logger::log('Switch contact ' . $cid . ' (' . $profile['url'] . ') for user ' . $uid . ' to ActivityPub'); - $photo = $profile['photo']; + $photo = defaults($profile, 'photo', null); unset($profile['photo']); unset($profile['baseurl']); + unset($profile['guid']); - $profile['nurl'] = normalise_link($profile['url']); + $profile['nurl'] = Strings::normaliseLink($profile['url']); DBA::update('contact', $profile, ['id' => $cid]); Contact::updateAvatar($photo, $uid, $cid); @@ -473,12 +609,12 @@ class Receiver // Send a new follow request to be sure that the connection still exists if (($uid != 0) && DBA::exists('contact', ['id' => $cid, 'rel' => [Contact::SHARING, Contact::FRIEND]])) { ActivityPub\Transmitter::sendActivity('Follow', $profile['url'], $uid); - logger('Send a new follow request to ' . $profile['url'] . ' for user ' . $uid, LOGGER_DEBUG); + Logger::log('Send a new follow request to ' . $profile['url'] . ' for user ' . $uid, Logger::DEBUG); } } /** - * + * * * @param $receivers * @param $actor @@ -490,12 +626,12 @@ class Receiver } foreach ($receivers as $receiver) { - $contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'nurl' => normalise_link($actor)]); + $contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'nurl' => Strings::normaliseLink($actor)]); if (DBA::isResult($contact)) { self::switchContact($contact['id'], $receiver, $actor); } - $contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'alias' => [normalise_link($actor), $actor]]); + $contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'alias' => [Strings::normaliseLink($actor), $actor]]); if (DBA::isResult($contact)) { self::switchContact($contact['id'], $receiver, $actor); } @@ -503,12 +639,12 @@ class Receiver } /** - * + * * * @param $object_data * @param array $activity * - * @return + * @return */ private static function addActivityFields($object_data, $activity) { @@ -531,39 +667,40 @@ class Receiver * @param string $object_id Object ID of the the provided object * @param array $object The provided object array * @param boolean $trust_source Do we trust the provided object? + * @param integer $uid User ID for the signature that we use to fetch data * * @return array with trusted and valid object data */ - private static function fetchObject($object_id, $object = [], $trust_source = false) + private static function fetchObject($object_id, $object = [], $trust_source = false, $uid = 0) { // By fetching the type we check if the object is complete. $type = JsonLD::fetchElement($object, '@type'); if (!$trust_source || empty($type)) { - $data = ActivityPub::fetchContent($object_id); + $data = ActivityPub::fetchContent($object_id, $uid); if (!empty($data)) { $object = JsonLD::compact($data); - logger('Fetched content for ' . $object_id, LOGGER_DEBUG); + Logger::log('Fetched content for ' . $object_id, Logger::DEBUG); } else { - logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG); + Logger::log('Empty content for ' . $object_id . ', check if content is available locally.', Logger::DEBUG); $item = Item::selectFirst([], ['uri' => $object_id]); if (!DBA::isResult($item)) { - logger('Object with url ' . $object_id . ' was not found locally.', LOGGER_DEBUG); + Logger::log('Object with url ' . $object_id . ' was not found locally.', Logger::DEBUG); return false; } - logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG); + Logger::log('Using already stored item for url ' . $object_id, Logger::DEBUG); $data = ActivityPub\Transmitter::createNote($item); $object = JsonLD::compact($data); } } else { - logger('Using original object for url ' . $object_id, LOGGER_DEBUG); + Logger::log('Using original object for url ' . $object_id, Logger::DEBUG); } $type = JsonLD::fetchElement($object, '@type'); if (empty($type)) { - logger('Empty type', LOGGER_DEBUG); + Logger::log('Empty type', Logger::DEBUG); return false; } @@ -576,10 +713,10 @@ class Receiver if (empty($object_id)) { return false; } - return self::fetchObject($object_id); + return self::fetchObject($object_id, [], false, $uid); } - logger('Unhandled object type: ' . $type, LOGGER_DEBUG); + Logger::log('Unhandled object type: ' . $type, Logger::DEBUG); } /** @@ -602,13 +739,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 * @@ -678,6 +850,7 @@ class Receiver $object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid'); $object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment'); + $object_data['diaspora:like'] = JsonLD::fetchElement($object, 'diaspora:like'); $object_data['actor'] = $object_data['author'] = $actor; $object_data['context'] = JsonLD::fetchElement($object, 'as:context'); $object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation'); @@ -686,6 +859,8 @@ class Receiver $object_data['summary'] = JsonLD::fetchElement($object, 'as:summary'); $object_data['content'] = JsonLD::fetchElement($object, 'as:content'); $object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode'); + $object_data['start-time'] = JsonLD::fetchElement($object, 'as:startTime', '@value'); + $object_data['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value'); $object_data['location'] = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place'); $object_data['latitude'] = JsonLD::fetchElement($object, 'as:location', 'as:latitude', '@type', 'as:Place'); $object_data['latitude'] = JsonLD::fetchElement($object_data, 'latitude', '@value'); @@ -693,19 +868,20 @@ 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'); // Special treatment for Hubzilla links if (is_array($object_data['alternate-url'])) { - if (!empty($object['as:url'])) { + $object_data['alternate-url'] = JsonLD::fetchElement($object_data['alternate-url'], 'as:href'); + + if (!is_string($object_data['alternate-url'])) { $object_data['alternate-url'] = JsonLD::fetchElement($object['as:url'], 'as:href'); - } else { - $object_data['alternate-url'] = null; } } - $object_data['receiver'] = self::getReceivers($object, $object_data['actor']); + $object_data['receiver'] = self::getReceivers($object, $object_data['actor'], $object_data['tags']); // Common object data: