const TARGET_FOLLOWER = 5;
const TARGET_ANSWER = 6;
const TARGET_GLOBAL = 7;
+ const TARGET_AUDIENCE = 8;
- const COMPLETION_NONE = 0;
- const COMPLETION_ANNOUCE = 1;
- const COMPLETION_RELAY = 2;
- const COMPLETION_MANUAL = 3;
- const COMPLETION_AUTO = 4;
+ const COMPLETION_NONE = 0;
+ const COMPLETION_ANNOUNCE = 1;
+ const COMPLETION_RELAY = 2;
+ const COMPLETION_MANUAL = 3;
+ const COMPLETION_AUTO = 4;
/**
* Checks incoming message from the inbox
* Fetches the object type for a given object id
*
* @param array $activity
- * @param string $object_id Object ID of the the provided object
+ * @param string $object_id Object ID of the provided object
* @param integer $uid User ID
*
* @return string with object type or NULL
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function fetchObjectType(array $activity, string $object_id, int $uid = 0)
+ public static function fetchObjectType(array $activity, string $object_id, int $uid = 0)
{
if (!empty($activity['as:object'])) {
$object_type = JsonLD::fetchElement($activity['as:object'], '@type');
} elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Announce', 'as:Follow'])) && in_array($object_type, self::CONTENT_TYPES)) {
// Create a mostly empty array out of the activity data (instead of the object).
// This way we later don't have to check for the existence of each individual array element.
- $object_data = self::processObject($activity, false);
+ $object_data = self::processObject($activity);
$object_data['name'] = $type;
$object_data['author'] = JsonLD::fetchElement($activity, 'as:actor', '@id');
$object_data['object_id'] = $object_id;
$object_data['object_type'] = $object_type;
}
- foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+ foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc', 'as:audience', 'as:attributedTo'] as $element) {
if ((empty($object_data['receiver_urls'][$element]) || in_array($element, ['as:bto', 'as:bcc'])) && !empty($urls[$element])) {
$object_data['receiver_urls'][$element] = array_unique(array_merge($object_data['receiver_urls'][$element] ?? [], $urls[$element]));
}
return true;
}
- if ($type == 'as:View') {
+ if (!DI::config()->get('system', 'process_view') && ($type == 'as:View')) {
Logger::info('View activities are ignored.', ['signer' => $signer, 'http_signer' => $http_signer]);
return true;
}
$object_data['object_activity'] = $activity;
}
- if (($type == 'as:Create') && $trust_source) {
+ if (($type == 'as:Create') && $trust_source && !in_array($completion, [self::COMPLETION_MANUAL, self::COMPLETION_ANNOUNCE])) {
if (self::hasArrived($object_data['object_id'])) {
Logger::info('The activity already arrived.', ['id' => $object_data['object_id']]);
return true;
Logger::info('The activity is already added.', ['id' => $object_data['object_id']]);
return true;
}
+ } elseif (($type == 'as:Create') && $trust_source && !self::hasArrived($object_data['object_id'])) {
+ self::addArrivedId($object_data['object_id']);
}
- $decouple = DI::config()->get('system', 'decoupled_receiver') && !in_array($completion, [self::COMPLETION_MANUAL, self::COMPLETION_ANNOUCE]);
+ $decouple = DI::config()->get('system', 'decoupled_receiver') && !in_array($completion, [self::COMPLETION_MANUAL, self::COMPLETION_ANNOUNCE]);
if ($decouple && ($trust_source || DI::config()->get('debug', 'ap_inbox_store_untrusted'))) {
$object_data = Queue::add($object_data, $type, $uid, $http_signer, $push, $trust_source);
case 'as:Announce':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
if (!Item::searchByLink($object_data['object_id'], $uid)) {
- if (ActivityPub\Processor::fetchMissingActivity($object_data['object_id'], [], $object_data['actor'], self::COMPLETION_ANNOUCE, $uid)) {
+ if (ActivityPub\Processor::fetchMissingActivity($object_data['object_id'], [], $object_data['actor'], self::COMPLETION_ANNOUNCE, $uid)) {
Logger::debug('Created announced id', ['uid' => $uid, 'id' => $object_data['object_id']]);
Queue::remove($object_data);
} else {
{
$urls = [];
- foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+ foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc', 'as:audience', 'as:attributedTo'] as $element) {
$receiver_list = JsonLD::fetchElementArray($activity, $element, '@id');
if (empty($receiver_list)) {
continue;
{
$reply = $receivers = $profile = [];
- // When it is an answer, we inherite the receivers from the parent
+ // When it is an answer, we inherit the receivers from the parent
$replyto = JsonLD::fetchElement($activity, 'as:inReplyTo', '@id');
if (!empty($replyto)) {
$reply = [$replyto];
$reply[] = $object_id;
}
- if (!empty($reply)) {
- $parents = Post::select(['uid'], DBA::mergeConditions(['uri' => $reply], ["`uid` != ?", 0]));
- while ($parent = Post::fetch($parents)) {
- $receivers[$parent['uid']] = ['uid' => $parent['uid'], 'type' => self::TARGET_ANSWER];
- }
- DBA::close($parents);
- }
-
if (!empty($actor)) {
$profile = APContact::getByURL($actor);
$followers = $profile['followers'] ?? '';
// We have to prevent false follower assumptions upon thread completions
$follower_target = empty($activity['thread-completion']) ? self::TARGET_FOLLOWER : self::TARGET_UNKNOWN;
- foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+ foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc','as:audience'] as $element) {
$receiver_list = JsonLD::fetchElementArray($activity, $element, '@id');
if (empty($receiver_list)) {
continue;
case 'as:bcc':
$type = self::TARGET_BCC;
break;
+ case 'as:audience':
+ $type = self::TARGET_AUDIENCE;
+ break;
}
$receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $type];
}
}
+ if (!empty($reply) && (!empty($receivers[0]) || !empty($receivers[-1]))) {
+ $parents = Post::select(['uid'], DBA::mergeConditions(['uri' => $reply], ["`uid` != ?", 0]));
+ while ($parent = Post::fetch($parents)) {
+ $receivers[$parent['uid']] = ['uid' => $parent['uid'], 'type' => self::TARGET_ANSWER];
+ }
+ DBA::close($parents);
+ }
+
self::switchContacts($receivers, $actor);
// "birdsitelive" is a service that mirrors tweets into the fediverse
- // These posts can be fetched without authentification, but are not marked as public
+ // These posts can be fetched without authentication, but are not marked as public
// We treat them as unlisted posts to be able to handle them.
if (empty($receivers) && $fetch_unlisted && Contact::isPlatform($actor, 'birdsitelive')) {
$receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
}
/**
- * Fetches the object data from external ressources if needed
+ * Fetches the object data from external resources if needed
*
- * @param string $object_id Object ID of the the provided object
+ * @param string $object_id Object ID of 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
Logger::info('Empty type');
return false;
}
- $object_data = self::processObject($object, false);
+ $object_data = self::processObject($object);
}
// We currently don't handle 'pt:CacheFile', but with this step we avoid logging
if (in_array($type, self::CONTENT_TYPES) || ($type == 'pt:CacheFile')) {
- $object_data = self::processObject($object, false);
+ $object_data = self::processObject($object);
if (!empty($data)) {
$object_data['raw-object'] = json_encode($data);
'type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType', '@value'),
'name' => JsonLD::fetchElement($attachment, 'as:name', '@value'),
- 'url' => JsonLD::fetchElement($attachment, 'as:url', '@id'),
+ 'url' => JsonLD::fetchElement($attachment, 'as:url', '@id') ?? JsonLD::fetchElement($attachment, 'as:href', '@id'),
'height' => JsonLD::fetchElement($attachment, 'as:height', '@value'),
'width' => JsonLD::fetchElement($attachment, 'as:width', '@value'),
'image' => JsonLD::fetchElement($attachment, 'as:image', '@id')
* @return array|bool Object data or FALSE if $object does not contain @id element
* @throws \Exception
*/
- private static function processObject(array $object, bool $c2s)
+ private static function processObject(array $object)
{
- if (!$c2s && !JsonLD::fetchElement($object, '@id')) {
+ if (!JsonLD::fetchElement($object, '@id')) {
return false;
}
+ $object_data = self::getObjectDataFromActivity($object);
+
+ $receiverdata = self::getReceivers($object, $object_data['actor'] ?? '', $object_data['tags'], true, false);
+ $receivers = $reception_types = [];
+ foreach ($receiverdata as $key => $data) {
+ $receivers[$key] = $data['uid'];
+ $reception_types[$data['uid']] = $data['type'] ?? 0;
+ }
+
+ $object_data['receiver_urls'] = self::getReceiverURL($object);
+ $object_data['receiver'] = $receivers;
+ $object_data['reception_type'] = $reception_types;
+
+ $object_data['unlisted'] = in_array(-1, $object_data['receiver']);
+ unset($object_data['receiver'][-1]);
+ unset($object_data['reception_type'][-1]);
+
+ return $object_data;
+ }
+
+ /**
+ * Create an object data array from a given activity
+ *
+ * @param array $object
+ *
+ * @return array Object data
+ */
+ public static function getObjectDataFromActivity(array $object): array
+ {
$object_data = [];
$object_data['object_type'] = JsonLD::fetchElement($object, '@type');
$object_data['id'] = JsonLD::fetchElement($object, '@id');
$object_data['question'] = self::processQuestion($object);
}
- if ($c2s) {
- $object_data['target'] = self::getTargets($object, $object_data['actor'] ?? '');
- $object_data['receiver'] = [];
- } else {
- $receiverdata = self::getReceivers($object, $object_data['actor'] ?? '', $object_data['tags'], true, false);
- $receivers = $reception_types = [];
- foreach ($receiverdata as $key => $data) {
- $receivers[$key] = $data['uid'];
- $reception_types[$data['uid']] = $data['type'] ?? 0;
- }
-
- $object_data['receiver_urls'] = self::getReceiverURL($object);
- $object_data['receiver'] = $receivers;
- $object_data['reception_type'] = $reception_types;
-
- $object_data['unlisted'] = in_array(-1, $object_data['receiver']);
- unset($object_data['receiver'][-1]);
- unset($object_data['reception_type'][-1]);
- }
return $object_data;
}
{
return DBA::exists('arrived-activity', ['object-id' => $id]);
}
-
- public static function processC2SActivity(array $activity, int $uid, array $application)
- {
- $ldactivity = JsonLD::compact($activity);
- if (empty($ldactivity)) {
- Logger::notice('Invalid activity', ['activity' => $activity, 'uid' => $uid]);
- return;
- }
-
- $type = JsonLD::fetchElement($ldactivity, '@type');
- if (!$type) {
- Logger::notice('Empty type', ['activity' => $ldactivity, 'uid' => $uid]);
- return;
- }
-
- $object_id = JsonLD::fetchElement($ldactivity, 'as:object', '@id') ?? '';
- $object_type = self::fetchObjectType($ldactivity, $object_id, $uid);
- if (!$object_type && !$object_id) {
- Logger::notice('Empty object type or id', ['activity' => $ldactivity, 'uid' => $uid]);
- return;
- }
-
- Logger::debug('Processing activity', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'activity' => $ldactivity]);
- self::routeC2SActivities($type, $object_type, $object_id, $uid, $application, $ldactivity);
- throw new \Friendica\Network\HTTPException\AcceptedException();
- }
-
- private static function getTargets(array $object, string $actor): array
- {
- $profile = APContact::getByURL($actor);
- $followers = $profile['followers'];
-
- $targets = [];
-
- foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
- switch ($element) {
- case 'as:to':
- $type = self::TARGET_TO;
- break;
- case 'as:cc':
- $type = self::TARGET_CC;
- break;
- case 'as:bto':
- $type = self::TARGET_BTO;
- break;
- case 'as:bcc':
- $type = self::TARGET_BCC;
- break;
- }
- $receiver_list = JsonLD::fetchElementArray($object, $element, '@id');
- if (empty($receiver_list)) {
- continue;
- }
-
- foreach ($receiver_list as $receiver) {
- if ($receiver == self::PUBLIC_COLLECTION) {
- $targets[self::TARGET_GLOBAL] = ($element == 'as:to');
- continue;
- }
-
- if ($receiver == $followers) {
- $targets[self::TARGET_FOLLOWER] = true;
- continue;
- }
- $targets[$type][] = Contact::getIdForURL($receiver);
- }
- }
- return $targets;
- }
-
- private static function routeC2SActivities(string $type, string $object_type, string $object_id, int $uid, array $application, array $ldactivity)
- {
- switch ($type) {
- case 'as:Create':
- if (in_array($object_type, self::CONTENT_TYPES)) {
- self::createContent($uid, $application, $ldactivity);
- }
- break;
- case 'as:Update':
- if (in_array($object_type, self::CONTENT_TYPES) && !empty($object_id)) {
- self::updateContent($uid, $object_id, $application, $ldactivity);
- }
- break;
- case 'as:Follow':
- if (in_array($object_type, self::ACCOUNT_TYPES) && !empty($object_id)) {
- self::followAccount($uid, $object_id, $ldactivity);
- }
- break;
- }
- }
-
- private static function createContent(int $uid, array $application, array $ldactivity)
- {
- $object_data = self::processObject($ldactivity['as:object'], true);
- $item = Processor::processC2SContent($object_data, $application, $uid);
- Logger::debug('Got data', ['item' => $item, 'object' => $object_data]);
-
- $id = Item::insert($item, true);
- if (!empty($id)) {
- $item = Post::selectFirst(['uri-id'], ['id' => $id]);
- if (!empty($item['uri-id'])) {
- System::jsonExit(Transmitter::createActivityFromItem($id));
- }
- }
- }
-
- private static function updateContent(int $uid, string $object_id, array $application, array $ldactivity)
- {
- $id = Item::fetchByLink($object_id, $uid);
- $original_post = Post::selectFirst(['uri-id'], ['uid' => $uid, 'origin' => true, 'id' => $id]);
- if (empty($original_post)) {
- Logger::debug('Item not found or does not belong to the user', ['id' => $id, 'uid' => $uid, 'object_id' => $object_id, 'activity' => $ldactivity]);
- return;
- }
-
- $object_data = self::processObject($ldactivity['as:object'], true);
- $item = Processor::processC2SContent($object_data, $application, $uid);
- if (empty($item['title']) && empty($item['body'])) {
- Logger::debug('Empty body and title', ['id' => $id, 'uid' => $uid, 'object_id' => $object_id, 'activity' => $ldactivity]);
- return;
- }
- $post = ['title' => $item['title'], 'body' => $item['body']];
- Logger::debug('Got data', ['id' => $id, 'uid' => $uid, 'item' => $post]);
- Item::update($post, ['id' => $id]);
- Item::updateDisplayCache($original_post['uri-id']);
-
- System::jsonExit(Transmitter::createActivityFromItem($id));
- }
-
- private static function followAccount($uid, $object_id, $ldactivity)
- {
-
- }
}
projects / friendica.git / blobdiff