X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=9b6dd4d1a6c1a91af4e798f6100c355ae625d967;hb=5ec1891e0abc5ad4d1cecb1627af8e68ba6d1df8;hp=e5653a554fd565aa79cf286e9fd2604e28d0ed1a;hpb=ba1bdc69208a4deee39dd54dda11b730448643dc;p=friendica.git diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index e5653a554f..9b6dd4d1a6 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 @@ -152,6 +154,37 @@ class Processor } } + /** + * Store attachment data + * + * @param array $activity + * @param array $item + */ + private static function storeQuestion($activity, $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 * @@ -178,11 +211,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 +241,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']; @@ -347,6 +386,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']); @@ -442,8 +482,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 +521,7 @@ class Processor /** * Add a post to the "Featured" collection * - * @param array $activity + * @param array $activity */ public static function addToFeaturedCollection(array $activity) { @@ -498,7 +538,7 @@ class Processor /** * Remove a post to the "Featured" collection * - * @param array $activity + * @param array $activity */ public static function removeFromFeaturedCollection(array $activity) { @@ -525,8 +565,12 @@ class Processor { $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']; @@ -564,7 +608,7 @@ class Processor private static function processContent($activity, $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']; @@ -575,6 +619,8 @@ class Processor $content = HTML::toBBCode($activity['content']); } + $item['title'] = trim(BBCode::toPlaintext($item['title'])); + if (!empty($activity['languages'])) { $item['language'] = self::processLanguages($activity['languages']); } @@ -908,7 +954,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); } } } @@ -980,8 +1029,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) { @@ -1002,6 +1051,8 @@ class Processor $posts = Post\Collection::selectToArrayForContact($pcid, Post\Collection::FEATURED); if (!empty($posts)) { $old_featured = array_column($posts, 'uri-id'); + } else { + $old_featured = []; } $featured = ActivityPub::fetchItems($apcontact['featured']); @@ -1230,6 +1281,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]); } @@ -1237,6 +1292,33 @@ class Processor Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']); } + /** + * Transmit pending events to the new follower + * + * @param integer $cid + * @param integer $uid + * @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 * @@ -1295,7 +1377,7 @@ class Processor $uid = User::getIdForURL($activity['object_id']); if (empty($uid)) { - return; + return; } Contact\User::setIsBlocked($cid, $uid, true); @@ -1318,7 +1400,7 @@ class Processor $uid = User::getIdForURL($activity['object_object']); if (empty($uid)) { - return; + return; } Contact\User::setIsBlocked($cid, $uid, false);