X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=d9dd7ee5b321993c99ad2249bb31375f1a8d04f2;hb=0ddb315b23882f3ba9e709f9a4e499cc237d1e96;hp=8bd08b95b48c93e6e47eecef7f15b9ddd2794ad8;hpb=8720561e49d2d5889fa4f4fd611efc790258ad1c;p=friendica.git diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 8bd08b95b4..d9dd7ee5b3 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -27,6 +27,7 @@ use Friendica\Content\Text\Markdown; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; +use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\APContact; @@ -46,6 +47,7 @@ use Friendica\Protocol\Relay; use Friendica\Util\DateTimeFormat; use Friendica\Util\JsonLD; use Friendica\Util\Strings; +use Friendica\Worker\Delivery; /** * ActivityPub Processor Protocol class @@ -69,7 +71,7 @@ class Processor * @param array $languages * @return string language JSON */ - private static function processLanguages(array $languages) + private static function processLanguages(array $languages): string { $codes = array_keys($languages); $lang = []; @@ -86,12 +88,13 @@ class Processor /** * Replaces emojis in the body * - * @param array $emojis + * @param int $uri_id * @param string $body + * @param array $emojis * * @return string with replaced emojis */ - private static function replaceEmojis(int $uri_id, $body, array $emojis) + private static function replaceEmojis(int $uri_id, string $body, array $emojis): string { $body = strtr($body, array_combine( @@ -141,7 +144,7 @@ class Processor * @param array $activity * @param array $item */ - private static function storeAttachments($activity, $item) + private static function storeAttachments(array $activity, array $item) { if (empty($activity['attachments'])) { return; @@ -152,13 +155,44 @@ class Processor } } + /** + * Store attachment data + * + * @param array $activity + * @param array $item + */ + private static function storeQuestion(array $activity, array $item) + { + if (empty($activity['question'])) { + return; + } + $question = ['multiple' => $activity['question']['multiple']]; + + if (!empty($activity['question']['voters'])) { + $question['voters'] = $activity['question']['voters']; + } + + if (!empty($activity['question']['end-time'])) { + $question['end-time'] = DateTimeFormat::utc($activity['question']['end-time']); + } + + Post\Question::update($item['uri-id'], $question); + + foreach ($activity['question']['options'] as $key => $option) { + $option = ['name' => $option['name'], 'replies' => $option['replies']]; + Post\QuestionOption::update($item['uri-id'], $key, $option); + } + + Logger::debug('Storing incoming question', ['type' => $activity['type'], 'uri-id' => $item['uri-id'], 'question' => $activity['question']]); + } + /** * Updates a message * * @param array $activity Activity array * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function updateItem($activity) + public static function updateItem(array $activity) { $item = Post::selectFirst(['uri', 'uri-id', 'thr-parent', 'gravity', 'post-type'], ['uri' => $activity['id']]); if (!DBA::isResult($item)) { @@ -178,11 +212,13 @@ class Processor $item = self::processContent($activity, $item); self::storeAttachments($activity, $item); + self::storeQuestion($activity, $item); if (empty($item)) { return; } + Post\History::add($item['uri-id'], $item); Item::update($item, ['uri' => $activity['id']]); if ($activity['object_type'] == 'as:Event') { @@ -206,8 +242,12 @@ class Processor $event['edited'] = DateTimeFormat::utc($activity['updated']); $event['summary'] = HTML::toBBCode($activity['name']); $event['desc'] = HTML::toBBCode($activity['content']); - $event['start'] = $activity['start-time']; - $event['finish'] = $activity['end-time']; + if (!empty($activity['start-time'])) { + $event['start'] = DateTimeFormat::utc($activity['start-time']); + } + if (!empty($activity['end-time'])) { + $event['finish'] = DateTimeFormat::utc($activity['end-time']); + } $event['nofinish'] = empty($event['finish']); $event['location'] = $activity['location']; @@ -223,7 +263,7 @@ class Processor * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function createItem($activity) + public static function createItem(array $activity): array { $item = []; $item['verb'] = Activity::POST; @@ -347,6 +387,7 @@ class Processor $item['plink'] = $activity['alternate-url'] ?? $item['uri']; self::storeAttachments($activity, $item); + self::storeQuestion($activity, $item); // We received the post via AP, so we set the protocol of the server to AP $contact = Contact::getById($item['author-id'], ['gsid']); @@ -371,7 +412,7 @@ class Processor * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function deleteItem($activity) + public static function deleteItem(array $activity) { $owner = Contact::getIdForURL($activity['actor']); @@ -386,7 +427,7 @@ class Processor * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function addTag($activity) + public static function addTag(array $activity) { if (empty($activity['object_content']) || empty($activity['object_id'])) { return; @@ -417,7 +458,7 @@ class Processor * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function createActivity($activity, $verb) + public static function createActivity(array $activity, string $verb) { $item = self::createItem($activity); if (empty($item)) { @@ -442,8 +483,8 @@ class Processor /** * Fetch the Uri-Id of a post for the "featured" collection * - * @param array $activity - * @return null|int + * @param array $activity + * @return null|int */ private static function getUriIdForFeaturedCollection(array $activity) { @@ -481,7 +522,7 @@ class Processor /** * Add a post to the "Featured" collection * - * @param array $activity + * @param array $activity */ public static function addToFeaturedCollection(array $activity) { @@ -498,7 +539,7 @@ class Processor /** * Remove a post to the "Featured" collection * - * @param array $activity + * @param array $activity */ public static function removeFromFeaturedCollection(array $activity) { @@ -521,12 +562,16 @@ class Processor * @return int event id * @throws \Exception */ - public static function createEvent($activity, $item) + public static function createEvent(array $activity, array $item): int { $event['summary'] = HTML::toBBCode($activity['name'] ?: $activity['summary']); $event['desc'] = HTML::toBBCode($activity['content']); - $event['start'] = $activity['start-time']; - $event['finish'] = $activity['end-time']; + if (!empty($activity['start-time'])) { + $event['start'] = DateTimeFormat::utc($activity['start-time']); + } + if (!empty($activity['end-time'])) { + $event['finish'] = DateTimeFormat::utc($activity['end-time']); + } $event['nofinish'] = empty($event['finish']); $event['location'] = $activity['location']; $event['cid'] = $item['contact-id']; @@ -561,20 +606,22 @@ class Processor * @return array|bool Returns the item array or false if there was an unexpected occurrence * @throws \Exception */ - private static function processContent($activity, $item) + private static function processContent(array $activity, array $item) { if (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/markdown')) { - $item['title'] = Markdown::toBBCode($activity['name']); + $item['title'] = strip_tags($activity['name']); $content = Markdown::toBBCode($activity['content']); } elseif (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/bbcode')) { $item['title'] = $activity['name']; $content = $activity['content']; } else { // By default assume "text/html" - $item['title'] = HTML::toBBCode($activity['name']); - $content = HTML::toBBCode($activity['content']); + $item['title'] = HTML::toBBCode($activity['name'] ?? ''); + $content = HTML::toBBCode($activity['content'] ?? ''); } + $item['title'] = trim(BBCode::toPlaintext($item['title'])); + if (!empty($activity['languages'])) { $item['language'] = self::processLanguages($activity['languages']); } @@ -604,7 +651,7 @@ class Processor $content = self::removeImplicitMentionsFromBody($content, $parent); } - $item['content-warning'] = HTML::toBBCode($activity['summary']); + $item['content-warning'] = HTML::toBBCode($activity['summary'] ?? ''); $item['raw-body'] = $item['body'] = $content; } @@ -643,7 +690,7 @@ class Processor * @param string $url message URL * @return string with GUID */ - private static function getGUIDByURL(string $url) + private static function getGUIDByURL(string $url): string { $parsed = parse_url($url); @@ -664,7 +711,7 @@ class Processor * @param array $item * @return boolean Is the message wanted? */ - private static function isSolicitedMessage(array $activity, array $item) + private static function isSolicitedMessage(array $activity, array $item): bool { // The checks are split to improve the support when searching why a message was accepted. if (count($activity['receiver']) != 1) { @@ -908,7 +955,10 @@ class Processor } else { $name = trim(parse_url($receiver, PHP_URL_PATH), '/'); } - Tag::store($uriid, $type, $name, $receiver); + + $target = Tag::getTargetType($receiver); + Logger::debug('Got target type', ['type' => $target, 'url' => $receiver]); + Tag::store($uriid, $type, $name, $receiver, $target); } } } @@ -922,7 +972,7 @@ class Processor * @return int|bool New mail table row id or false on error * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function postMail($activity, $item) + private static function postMail(array $activity, array $item) { if (($item['gravity'] != GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) { Logger::info('Parent not found, mail will be discarded.', ['uid' => $item['uid'], 'uri' => $item['thr-parent']]); @@ -980,8 +1030,8 @@ class Processor /** * Fetch featured posts from a contact with the given url * - * @param string $url - * @return void + * @param string $url + * @return void */ public static function fetchFeaturedPosts(string $url) { @@ -1063,7 +1113,7 @@ class Processor * @return string fetched message URL * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '', int $completion = Receiver::COMPLETION_MANUAL) + public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '', int $completion = Receiver::COMPLETION_MANUAL): string { if (!empty($child['receiver'])) { $uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']); @@ -1158,7 +1208,7 @@ class Processor * @param string $id object ID * @return boolean true if message is accepted */ - private static function acceptIncomingMessage(array $activity, string $id) + private static function acceptIncomingMessage(array $activity, string $id): bool { if (empty($activity['as:object'])) { Logger::info('No object field in activity - accepted', ['id' => $id]); @@ -1166,7 +1216,7 @@ class Processor } $replyto = JsonLD::fetchElement($activity['as:object'], 'as:inReplyTo', '@id'); - $uriid = ItemURI::getIdByURI($replyto); + $uriid = ItemURI::getIdByURI($replyto ?? ''); if (Post::exists(['uri-id' => $uriid])) { Logger::info('Post is a reply to an existing post - accepted', ['id' => $id, 'uri-id' => $uriid, 'replyto' => $replyto]); return true; @@ -1175,7 +1225,7 @@ class Processor $attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo', '@id'); $authorid = Contact::getIdForURL($attributed_to); - $body = HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value')); + $body = HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value') ?? ''); $messageTags = []; $tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []); @@ -1195,10 +1245,11 @@ class Processor * perform a "follow" request * * @param array $activity + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function followUser($activity) + public static function followUser(array $activity) { $uid = User::getIdForURL($activity['object_id']); if (empty($uid)) { @@ -1216,8 +1267,10 @@ class Processor Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]); } - $item = ['author-id' => Contact::getIdForURL($activity['actor']), - 'author-link' => $activity['actor']]; + $item = [ + 'author-id' => Contact::getIdForURL($activity['actor']), + 'author-link' => $activity['actor'], + ]; // Ensure that the contact has got the right network type self::switchContact($item['author-id']); @@ -1232,6 +1285,10 @@ class Processor return; } + if ($result && DI::config()->get('system', 'transmit_pending_events') && ($owner['contact-type'] == Contact::TYPE_COMMUNITY)) { + self::transmitPendingEvents($cid, $owner['uid']); + } + if (empty($contact)) { Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]); } @@ -1239,13 +1296,40 @@ class Processor Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']); } + /** + * Transmit pending events to the new follower + * + * @param integer $cid Contact id + * @param integer $uid User id + * @return void + */ + private static function transmitPendingEvents(int $cid, int $uid) + { + $account = DBA::selectFirst('account-user-view', ['ap-inbox', 'ap-sharedinbox'], ['id' => $cid]); + $inbox = $account['ap-sharedinbox'] ?: $account['ap-inbox']; + + $events = DBA::select('event', ['id'], ["`uid` = ? AND `start` > ? AND `type` != ?", $uid, DateTimeFormat::utcNow(), 'birthday']); + while ($event = DBA::fetch($events)) { + $post = Post::selectFirst(['id', 'uri-id', 'created'], ['event-id' => $event['id']]); + if (empty($post)) { + continue; + } + if (DI::config()->get('system', 'bulk_delivery')) { + Post\Delivery::add($post['uri-id'], $uid, $inbox, $post['created'], Delivery::POST, [$cid]); + Worker::add(PRIORITY_HIGH, 'APDelivery', '', 0, $inbox, 0); + } else { + Worker::add(PRIORITY_HIGH, 'APDelivery', Delivery::POST, $post['id'], $inbox, $uid, [$cid], $post['uri-id']); + } + } + } + /** * Update the given profile * * @param array $activity * @throws \Exception */ - public static function updatePerson($activity) + public static function updatePerson(array $activity) { if (empty($activity['object_id'])) { return; @@ -1259,9 +1343,10 @@ class Processor * Delete the given profile * * @param array $activity + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function deletePerson($activity) + public static function deletePerson(array $activity) { if (empty($activity['object_id']) || empty($activity['actor'])) { Logger::info('Empty object id or actor.'); @@ -1286,9 +1371,10 @@ class Processor * Blocks the user by the contact * * @param array $activity + * @return void * @throws \Exception */ - public static function blockAccount($activity) + public static function blockAccount(array $activity) { $cid = Contact::getIdForURL($activity['actor']); if (empty($cid)) { @@ -1297,7 +1383,7 @@ class Processor $uid = User::getIdForURL($activity['object_id']); if (empty($uid)) { - return; + return; } Contact\User::setIsBlocked($cid, $uid, true); @@ -1309,9 +1395,10 @@ class Processor * Unblocks the user by the contact * * @param array $activity + * @return void * @throws \Exception */ - public static function unblockAccount($activity) + public static function unblockAccount(array $activity) { $cid = Contact::getIdForURL($activity['actor']); if (empty($cid)) { @@ -1320,7 +1407,7 @@ class Processor $uid = User::getIdForURL($activity['object_object']); if (empty($uid)) { - return; + return; } Contact\User::setIsBlocked($cid, $uid, false); @@ -1335,7 +1422,7 @@ class Processor * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function acceptFollowUser($activity) + public static function acceptFollowUser(array $activity) { $uid = User::getIdForURL($activity['object_actor']); if (empty($uid)) { @@ -1369,7 +1456,7 @@ class Processor * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function rejectFollowUser($activity) + public static function rejectFollowUser(array $activity) { $uid = User::getIdForURL($activity['object_actor']); if (empty($uid)) { @@ -1402,7 +1489,7 @@ class Processor * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function undoActivity($activity) + public static function undoActivity(array $activity) { if (empty($activity['object_id'])) { return; @@ -1427,7 +1514,7 @@ class Processor * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function undoFollowUser($activity) + public static function undoFollowUser(array $activity) { $uid = User::getIdForURL($activity['object_object']); if (empty($uid)) { @@ -1462,7 +1549,7 @@ class Processor * @param integer $cid Contact ID * @throws \Exception */ - private static function switchContact($cid) + private static function switchContact(int $cid) { $contact = DBA::selectFirst('contact', ['network', 'url'], ['id' => $cid]); if (!DBA::isResult($contact) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN]) || Contact::isLocal($contact['url'])) { @@ -1482,7 +1569,7 @@ class Processor * @return array * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function getImplicitMentionList(array $parent) + private static function getImplicitMentionList(array $parent): array { $parent_terms = Tag::getByURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]); @@ -1520,7 +1607,7 @@ class Processor * @param array $parent * @return string */ - private static function removeImplicitMentionsFromBody(string $body, array $parent) + private static function removeImplicitMentionsFromBody(string $body, array $parent): string { if (DI::config()->get('system', 'disable_implicit_mentions')) { return $body;