X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=964499af1d41904d42ced55872d3b95e92559377;hb=4831688dc0ffbf72956942c9ac37960497e9b8c8;hp=32cfcc6cb0346f1674159b4b51b20f69ba031a84;hpb=93866b477a2ea43ed12b72cf35bb3241e4c133b3;p=friendica.git diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 32cfcc6cb0..964499af1d 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -10,14 +10,16 @@ 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; /** - * ActivityPub Protocol class + * ActivityPub Processor Protocol class */ class Processor { @@ -100,13 +102,30 @@ class Processor return $item; } + /** + * Updates a message + * + * @param array $activity Activity array + */ + public static function updateItem($activity) + { + $item = []; + $item['changed'] = DateTimeFormat::utcNow(); + $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'])); + $item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']); + + Item::update($item, ['uri' => $activity['id']]); + } + /** * Prepares data for a message * * @param array $activity Activity array - * @param string $body original source */ - public static function createItem($activity, $body) + public static function createItem($activity) { $item = []; $item['verb'] = ACTIVITY_POST; @@ -125,24 +144,9 @@ class Processor self::fetchMissingActivity($activity['reply-to-id'], $activity); } - self::postItem($activity, $item, $body); - } + $item['diaspora_signed_text'] = defaults($activity, 'diaspora:comment', ''); - /** - * Prepare the item array for a "like" - * - * @param array $activity Activity array - * @param string $body original source - */ - public static function likeItem($activity, $body) - { - $item = []; - $item['verb'] = ACTIVITY_LIKE; - $item['parent-uri'] = $activity['object_id']; - $item['gravity'] = GRAVITY_ACTIVITY; - $item['object-type'] = ACTIVITY_OBJ_NOTE; - - self::postItem($activity, $item, $body); + self::postItem($activity, $item); } /** @@ -159,20 +163,55 @@ class Processor } /** - * Prepare the item array for a "dislike" + * Prepare the item array for an activity * * @param array $activity Activity array - * @param string $body original source + * @param string $verb Activity verb */ - public static function dislikeItem($activity, $body) + public static function createActivity($activity, $verb) { $item = []; - $item['verb'] = ACTIVITY_DISLIKE; + $item['verb'] = $verb; $item['parent-uri'] = $activity['object_id']; $item['gravity'] = GRAVITY_ACTIVITY; $item['object-type'] = ACTIVITY_OBJ_NOTE; - self::postItem($activity, $item, $body); + $item['diaspora_signed_text'] = defaults($activity, 'diaspora:like', ''); + + self::postItem($activity, $item); + } + + /** + * Create an event + * + * @param array $activity Activity array + * @param array $item + */ + 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['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']; + + $condition = ['uri' => $item['uri'], 'uid' => $item['uid']]; + $ev = DBA::selectFirst('event', ['id'], $condition); + if (DBA::isResult($ev)) { + $event['id'] = $ev['id']; + } + + $event_id = Event::store($event); + logger('Event '.$event_id.' was stored', LOGGER_DEBUG); } /** @@ -180,9 +219,8 @@ class Processor * * @param array $activity Activity data * @param array $item item array - * @param string $body original source */ - private static function postItem($activity, $item, $body) + private static function postItem($activity, $item) { /// @todo What to do with $activity['context']? @@ -193,8 +231,18 @@ class Processor $item['network'] = Protocol::ACTIVITYPUB; $item['private'] = !in_array(0, $activity['receiver']); + $item['author-link'] = $activity['author']; $item['author-id'] = Contact::getIdForURL($activity['author'], 0, true); - $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); + + if (empty($activity['thread-completion'])) { + $item['owner-link'] = $activity['actor']; + $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); + } else { + logger('Ignoring actor because of thread completion.', LOGGER_DEBUG); + $item['owner-link'] = $item['author-link']; + $item['owner-id'] = $item['author-id']; + } + $item['uri'] = $activity['id']; $item['created'] = $activity['published']; $item['edited'] = $activity['updated']; @@ -202,9 +250,19 @@ class Processor $item['title'] = HTML::toBBCode($activity['name']); $item['content-warning'] = HTML::toBBCode($activity['summary']); $item['body'] = self::convertMentions(HTML::toBBCode($activity['content'])); + + if (($activity['object_type'] == 'as:Video') && !empty($activity['alternate-url'])) { + $item['body'] .= "\n[video]" . $activity['alternate-url'] . '[/video]'; + } + $item['location'] = $activity['location']; + + if (!empty($item['latitude']) && !empty($item['longitude'])) { + $item['coord'] = $item['latitude'] . ' ' . $item['longitude']; + } + $item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']); - $item['app'] = $activity['service']; + $item['app'] = $activity['generator']; $item['plink'] = defaults($activity, 'alternate-url', $item['uri']); $item = self::constructAttachList($activity['attachments'], $item); @@ -213,11 +271,6 @@ class Processor $item['body'] = $activity['source']; } - $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB; - $item['source'] = $body; - $item['conversation-href'] = $activity['context']; - $item['conversation-uri'] = $activity['conversation']; - foreach ($activity['receiver'] as $receiver) { $item['uid'] = $receiver; $item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true); @@ -226,6 +279,10 @@ class Processor $item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true); } + if ($activity['object_type'] == 'as:Event') { + self::createEvent($activity, $item); + } + $item_id = Item::insert($item); logger('Storing for user ' . $item['uid'] . ': ' . $item_id); } @@ -257,10 +314,13 @@ class Processor $activity['cc'] = defaults($object, 'cc', []); $activity['actor'] = $child['author']; $activity['object'] = $object; - $activity['published'] = $object['published']; + $activity['published'] = defaults($object, 'published', $child['published']); $activity['type'] = 'Create'; $ldactivity = JsonLD::compact($activity); + + $ldactivity['thread-completion'] = true; + ActivityPub\Receiver::processActivity($ldactivity); logger('Activity ' . $url . ' had been fetched and processed.'); } @@ -281,6 +341,7 @@ class Processor $cid = Contact::getIdForURL($activity['actor'], $uid); if (!empty($cid)) { + self::switchContact($cid); $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]); } else { $contact = false; @@ -289,17 +350,15 @@ class Processor $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']); + Contact::addRelationship($owner, $contact, $item); $cid = Contact::getIdForURL($activity['actor'], $uid); if (empty($cid)) { return; } - $contact = DBA::selectFirst('contact', ['network'], ['id' => $cid]); - if ($contact['network'] != Protocol::ACTIVITYPUB) { - Contact::updateFromProbe($cid, Protocol::ACTIVITYPUB); - } - DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]); logger('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']); } @@ -365,6 +424,8 @@ class Processor return; } + self::switchContact($cid); + $fields = ['pending' => false]; $contact = DBA::selectFirst('contact', ['rel'], ['id' => $cid]); @@ -397,6 +458,8 @@ class Processor return; } + self::switchContact($cid); + if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING, 'pending' => true])) { Contact::remove($cid); logger('Rejected contact request from contact ' . $cid . ' for user ' . $uid . ' - contact had been removed.', LOGGER_DEBUG); @@ -448,6 +511,8 @@ class Processor return; } + self::switchContact($cid); + $contact = DBA::selectFirst('contact', [], ['id' => $cid]); if (!DBA::isResult($contact)) { return; @@ -456,4 +521,20 @@ class Processor Contact::removeFollower($owner, $contact); logger('Undo following request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG); } + + /** + * Switches a contact to AP if needed + * + * @param integer $cid Contact ID + */ + private static function switchContact($cid) + { + $contact = DBA::selectFirst('contact', ['network'], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]); + if (!DBA::isResult($contact) || ($contact['network'] == Protocol::ACTIVITYPUB)) { + return; + } + + logger('Change existing contact ' . $cid . ' from ' . $contact['network'] . ' to ActivityPub.'); + Contact::updateFromProbe($cid, Protocol::ACTIVITYPUB); + } }