X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=fd6d70a42a2d01fac09c0501a2da35a57a03d13b;hb=75728430832633407c78a49d47481e97bbd9e00e;hp=1e5001010855ae68b8b8beaf25b75b6ed4903398;hpb=62761e10991a5cb824582e09c0276eed130eb847;p=friendica.git diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 1e50010108..fd6d70a42a 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -5,19 +5,19 @@ namespace Friendica\Protocol\ActivityPub; use Friendica\Database\DBA; +use Friendica\Content\Text\HTML; +use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Model\Conversation; use Friendica\Model\Contact; use Friendica\Model\APContact; use Friendica\Model\Item; use Friendica\Model\Event; use Friendica\Model\User; -use Friendica\Content\Text\HTML; -use Friendica\Util\JsonLD; -use Friendica\Core\Config; use Friendica\Protocol\ActivityPub; use Friendica\Util\DateTimeFormat; +use Friendica\Util\JsonLD; +use Friendica\Util\Strings; /** * ActivityPub Processor Protocol class @@ -29,7 +29,7 @@ class Processor * * @param string $body * - * @return converted body + * @return string converted body */ private static function convertMentions($body) { @@ -39,6 +39,23 @@ class Processor return $body; } + /** + * Replaces emojis in the body + * + * @param array $emojis + * @param string $body + * + * @return string with replaced emojis + */ + public static function replaceEmojis($emojis, $body) + { + foreach ($emojis as $emoji) { + $replace = '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]'; + $body = str_replace($emoji['name'], $replace, $body); + } + return $body; + } + /** * Constructs a string with tags for a given tag array * @@ -75,7 +92,7 @@ class Processor * @param array $attachments * @param array $item * - * @return item array + * @return array array */ private static function constructAttachList($attachments, $item) { @@ -106,7 +123,8 @@ class Processor /** * Updates a message * - * @param array $activity Activity array + * @param array $activity Activity array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function updateItem($activity) { @@ -115,7 +133,8 @@ class Processor $item['edited'] = $activity['updated']; $item['title'] = HTML::toBBCode($activity['name']); $item['content-warning'] = HTML::toBBCode($activity['summary']); - $item['body'] = self::convertMentions(HTML::toBBCode($activity['content'])); + $content = self::replaceEmojis($activity['emojis'], HTML::toBBCode($activity['content'])); + $item['body'] = self::convertMentions($content); $item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']); Item::update($item, ['uri' => $activity['id']]); @@ -124,7 +143,9 @@ class Processor /** * Prepares data for a message * - * @param array $activity Activity array + * @param array $activity Activity array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function createItem($activity) { @@ -154,6 +175,8 @@ class Processor * Delete items * * @param array $activity + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function deleteItem($activity) { @@ -168,6 +191,8 @@ class Processor * * @param array $activity Activity array * @param string $verb Activity verb + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function createActivity($activity, $verb) { @@ -187,23 +212,24 @@ class Processor * * @param array $activity Activity array * @param array $item + * @throws \Exception */ public static function createEvent($activity, $item) { - $event['summary'] = $activity['name']; - $event['desc'] = $activity['content']; - $event['start'] = $activity['start-time']; - $event['finish'] = $activity['end-time']; + $event['summary'] = HTML::toBBCode($activity['name']); + $event['desc'] = HTML::toBBCode($activity['content']); + $event['start'] = $activity['start-time']; + $event['finish'] = $activity['end-time']; $event['nofinish'] = empty($event['finish']); $event['location'] = $activity['location']; - $event['adjust'] = true; - $event['cid'] = $item['contact-id']; - $event['uid'] = $item['uid']; - $event['uri'] = $item['uri']; - $event['edited'] = $item['edited']; - $event['private'] = $item['private']; - $event['guid'] = $item['guid']; - $event['plink'] = $item['plink']; + $event['adjust'] = true; + $event['cid'] = $item['contact-id']; + $event['uid'] = $item['uid']; + $event['uri'] = $item['uri']; + $event['edited'] = $item['edited']; + $event['private'] = $item['private']; + $event['guid'] = $item['guid']; + $event['plink'] = $item['plink']; $condition = ['uri' => $item['uri'], 'uid' => $item['uid']]; $ev = DBA::selectFirst('event', ['id'], $condition); @@ -218,8 +244,10 @@ class Processor /** * Creates an item post * - * @param array $activity Activity data - * @param array $item item array + * @param array $activity Activity data + * @param array $item item array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function postItem($activity, $item) { @@ -245,12 +273,26 @@ class Processor } $item['uri'] = $activity['id']; + + if (($item['parent-uri'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) { + $item_private = !in_array(0, $activity['item_receiver']); + $parent = Item::selectFirst(['private'], ['uri' => $item['parent-uri']]); + if (!DBA::isResult($parent)) { + return; + } + if ($item_private && !$parent['private']) { + Logger::log('Item ' . $item['uri'] . ' is private but the parent ' . $item['parent-uri'] . ' is not. So we drop it.'); + return; + } + } + $item['created'] = $activity['published']; $item['edited'] = $activity['updated']; $item['guid'] = $activity['diaspora:guid']; $item['title'] = HTML::toBBCode($activity['name']); $item['content-warning'] = HTML::toBBCode($activity['summary']); - $item['body'] = self::convertMentions(HTML::toBBCode($activity['content'])); + $content = self::replaceEmojis($activity['emojis'], HTML::toBBCode($activity['content'])); + $item['body'] = self::convertMentions($content); if (($activity['object_type'] == 'as:Video') && !empty($activity['alternate-url'])) { $item['body'] .= "\n[video]" . $activity['alternate-url'] . '[/video]'; @@ -287,6 +329,15 @@ class Processor $item_id = Item::insert($item); Logger::log('Storing for user ' . $item['uid'] . ': ' . $item_id); } + + if (!$item['private'] && ($item['gravity'] == GRAVITY_PARENT) && ($item['author-link'] != $item['owner-link'])) { + $author = APContact::getByURL($item['owner-link'], false); + // We send automatic follow requests for reshared messages. (We don't need though for forum posts) + if ($author['type'] != 'Group') { + Logger::log('Send follow request for ' . $item['uri'] . ' to ' . $item['author-link'], Logger::DEBUG); + ActivityPub\Transmitter::sendFollowObject($item['uri'], $item['author-link']); + } + } } /** @@ -294,6 +345,7 @@ class Processor * * @param $url * @param $child + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function fetchMissingActivity($url, $child) { @@ -309,6 +361,11 @@ class Processor return; } + if (empty($object['id'])) { + Logger::log('Activity ' . $url . ' has got not id, aborting. ' . json_encode($object)); + return; + } + $activity = []; $activity['@context'] = $object['@context']; unset($object['@context']); @@ -332,6 +389,8 @@ class Processor * perform a "follow" request * * @param array $activity + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function followUser($activity) { @@ -345,6 +404,7 @@ class Processor $cid = Contact::getIdForURL($activity['actor'], $uid); if (!empty($cid)) { self::switchContact($cid); + DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]); $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]); } else { $contact = false; @@ -362,7 +422,10 @@ class Processor return; } - DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]); + if (empty($contact)) { + DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]); + } + Logger::log('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']); } @@ -370,6 +433,7 @@ class Processor * Update the given profile * * @param array $activity + * @throws \Exception */ public static function updatePerson($activity) { @@ -385,6 +449,7 @@ class Processor * Delete the given profile * * @param array $activity + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function deletePerson($activity) { @@ -398,7 +463,7 @@ class Processor return; } - $contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object_id'])]); + $contacts = DBA::select('contact', ['id'], ['nurl' => Strings::normaliseLink($activity['object_id'])]); while ($contact = DBA::fetch($contacts)) { Contact::remove($contact['id']); } @@ -411,6 +476,8 @@ class Processor * Accept a follow request * * @param array $activity + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function acceptFollowUser($activity) { @@ -419,8 +486,6 @@ class Processor return; } - $owner = User::getOwnerDataById($uid); - $cid = Contact::getIdForURL($activity['actor'], $uid); if (empty($cid)) { Logger::log('No contact found for ' . $activity['actor'], Logger::DEBUG); @@ -445,6 +510,8 @@ class Processor * Reject a follow request * * @param array $activity + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function rejectFollowUser($activity) { @@ -453,8 +520,6 @@ class Processor return; } - $owner = User::getOwnerDataById($uid); - $cid = Contact::getIdForURL($activity['actor'], $uid); if (empty($cid)) { Logger::log('No contact found for ' . $activity['actor'], Logger::DEBUG); @@ -475,6 +540,8 @@ class Processor * Undo activity like "like" or "dislike" * * @param array $activity + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function undoActivity($activity) { @@ -498,6 +565,8 @@ class Processor * Activity to remove a follower * * @param array $activity + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function undoFollowUser($activity) { @@ -529,6 +598,7 @@ class Processor * Switches a contact to AP if needed * * @param integer $cid Contact ID + * @throws \Exception */ private static function switchContact($cid) {