const TARGET_FOLLOWER = 5;
const TARGET_ANSWER = 6;
const TARGET_GLOBAL = 7;
+ const TARGET_AUDIENCE = 8;
const COMPLETION_NONE = 0;
const COMPLETION_ANNOUNCE = 1;
const COMPLETION_RELAY = 2;
const COMPLETION_MANUAL = 3;
const COMPLETION_AUTO = 4;
+ const COMPLETION_ASYNC = 5;
/**
* Checks incoming message from the inbox
if (empty($apcontact)) {
Logger::notice('Unable to retrieve AP contact for actor - message is discarded', ['actor' => $actor]);
return;
- } elseif (APContact::isRelay($apcontact)) {
+ } elseif (APContact::isRelay($apcontact) && self::isRelayPost($ldactivity)) {
self::processRelayPost($ldactivity, $actor);
return;
} else {
}
$sig_contact = HTTPSignature::getKeyIdContact($header);
- if (APContact::isRelay($sig_contact)) {
+ if (APContact::isRelay($sig_contact) && self::isRelayPost($ldactivity)) {
Logger::info('Message from a relay', ['url' => $sig_contact['url']]);
self::processRelayPost($ldactivity, $sig_contact['url']);
return;
}
/**
- * Process incoming posts from relays
+ * Check if the activity is a post rhat can be send via a relay
*
- * @param array $activity
- * @param string $actor
- * @return void
+ * @param array $activity
+ * @return boolean
*/
- private static function processRelayPost(array $activity, string $actor)
+ private static function isRelayPost(array $activity): bool
{
$type = JsonLD::fetchElement($activity, '@type');
if (!$type) {
- Logger::notice('Empty type', ['activity' => $activity, 'actor' => $actor]);
- return;
+ return false;
}
$object_type = JsonLD::fetchElement($activity, 'as:object', '@type') ?? '';
$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
if (empty($object_id)) {
- Logger::notice('No object id found', ['type' => $type, 'object_type' => $object_type, 'actor' => $actor, 'activity' => $activity]);
- return;
+ return false;
}
$handle = ($type == 'as:Announce');
if (!$handle && in_array($type, ['as:Create', 'as:Update'])) {
$handle = in_array($object_type, self::CONTENT_TYPES);
}
+ return $handle;
+ }
- if (!$handle) {
- $trust_source = false;
- $object_data = self::prepareObjectData($activity, 0, false, $trust_source);
-
- if (!$trust_source) {
- Logger::notice('Activity trust could not be achieved.', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
- return;
- }
+ /**
+ * Process incoming posts from relays
+ *
+ * @param array $activity
+ * @param string $actor
+ * @return void
+ */
+ private static function processRelayPost(array $activity, string $actor)
+ {
+ $type = JsonLD::fetchElement($activity, '@type');
+ if (!$type) {
+ Logger::notice('Empty type', ['activity' => $activity, 'actor' => $actor]);
+ return;
+ }
- if (empty($object_data)) {
- Logger::notice('No object data found', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
- return;
- }
+ $object_type = JsonLD::fetchElement($activity, 'as:object', '@type') ?? '';
- if (self::routeActivities($object_data, $type, true)) {
- Logger::debug('Handled activity', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor]);
- } else {
- Logger::info('Unhandled activity', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
- }
+ $object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
+ if (empty($object_id)) {
+ Logger::notice('No object id found', ['type' => $type, 'object_type' => $object_type, 'actor' => $actor, 'activity' => $activity]);
return;
}
return;
}
- Logger::debug('Got relayed message id', ['id' => $object_id, 'actor' => $actor]);
+ Logger::debug('Process post from relay server', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor]);
$item_id = Item::searchByLink($object_id);
if ($item_id) {
return;
}
- $id = Processor::fetchMissingActivity($object_id, [], $actor, self::COMPLETION_RELAY);
- if (empty($id)) {
- Logger::notice('Relayed message had not been fetched', ['id' => $object_id, 'actor' => $actor]);
- return;
+ if (!DI::config()->get('system', 'decoupled_receiver')) {
+ $id = Processor::fetchMissingActivity($object_id, [], $actor, self::COMPLETION_RELAY);
+ if (!empty($id)) {
+ Logger::notice('Relayed message is fetched', ['result' => $id, 'id' => $object_id, 'actor' => $actor]);
+ } else {
+ Logger::notice('Relayed message had not been fetched', ['id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
+ }
+ } elseif (!Fetch::hasWorker($object_id)) {
+ Logger::notice('Fetching is done by worker.', ['id' => $object_id]);
+ Fetch::add($object_id);
+ $activity['recursion-depth'] = 0;
+ $wid = Worker::add(Worker::PRIORITY_HIGH, 'FetchMissingActivity', $object_id, [], $actor, self::COMPLETION_RELAY);
+ Fetch::setWorkerId($object_id, $wid);
+ } else {
+ Logger::debug('Activity will already be fetched via a worker.', ['url' => $object_id]);
}
}
* 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
/**
* Prepare the object array
*
- * @param array $activity Array with activity data
- * @param integer $uid User ID
- * @param boolean $push Message had been pushed to our system
- * @param boolean $trust_source Do we trust the source?
+ * @param array $activity Array with activity data
+ * @param integer $uid User ID
+ * @param boolean $push Message had been pushed to our system
+ * @param boolean $trust_source Do we trust the source?
+ * @param string $original_actor Actor of the original activity. Used for receiver detection. (Optional)
*
* @return array with object data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function prepareObjectData(array $activity, int $uid, bool $push, bool &$trust_source): array
+ public static function prepareObjectData(array $activity, int $uid, bool $push, bool &$trust_source, string $original_actor = ''): array
{
$id = JsonLD::fetchElement($activity, '@id');
$type = JsonLD::fetchElement($activity, '@type');
$fetched = false;
if (!empty($id) && !$trust_source) {
- $fetch_uid = $uid ?: self::getBestUserForActivity($activity);
+ $fetch_uid = $uid ?: self::getBestUserForActivity($activity, $original_actor);
$fetched_activity = Processor::fetchCachedActivity($fetch_id, $fetch_uid);
if (!empty($fetched_activity)) {
$type = JsonLD::fetchElement($activity, '@type');
// Fetch all receivers from to, cc, bto and bcc
- $receiverdata = self::getReceivers($activity, $actor, [], false, $push || $fetched);
+ $receiverdata = self::getReceivers($activity, $original_actor ?: $actor, [], false, $push || $fetched);
$receivers = $reception_types = [];
foreach ($receiverdata as $key => $data) {
$receivers[$key] = $data['uid'];
// We possibly need some user to fetch private content,
// so we fetch one out of the receivers if no uid is provided.
- $fetch_uid = $uid ?: self::getBestUserForActivity($activity);
+ $fetch_uid = $uid ?: self::getBestUserForActivity($activity, $original_actor);
$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
if (empty($object_id)) {
$object_type = self::fetchObjectType($activity, $object_id, $fetch_uid);
- // Fetch the activity on Lemmy "Announce" messages (announces of activities)
- if (($type == 'as:Announce') && in_array($object_type, array_merge(self::ACTIVITY_TYPES, ['as:Delete', 'as:Undo', 'as:Update']))) {
- Logger::debug('Fetch announced activity', ['object' => $object_id]);
- $data = Processor::fetchCachedActivity($object_id, $fetch_uid);
- if (!empty($data)) {
- $type = $object_type;
- $activity = JsonLD::compact($data);
-
- // Some variables need to be refetched since the activity changed
- $actor = JsonLD::fetchElement($activity, 'as:actor', '@id');
- $object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
- $object_type = self::fetchObjectType($activity, $object_id, $fetch_uid);
- }
- }
-
// Any activities on account types must not be altered
if (in_array($type, ['as:Flag'])) {
$object_data = [];
$object_data['object_id'] = $object_id;
- // Test if it is an answer to a mail
- if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) {
+ // Test if it is a direct message
+ if (self::checkForDirectMessage($object_data, $activity)) {
$object_data['directmessage'] = true;
- } else {
- $object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage');
+ } elseif (!empty(JsonLD::fetchElement($activity['as:object'], 'misskey:_misskey_talk'))) {
+ $object_data = self::setChatData($object_data, $receivers);
}
} 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);
+ $object_data = self::processObject($activity, $original_actor);
$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]));
}
$object_data['receiver'] = array_replace($object_data['receiver'] ?? [], $receivers);
$object_data['reception_type'] = array_replace($object_data['reception_type'] ?? [], $reception_types);
-// This check here interferes with Hubzilla posts where the author host differs from the host the post was created
-// $author = $object_data['author'] ?? $actor;
-// if (!empty($author) && !empty($object_data['id'])) {
-// $author_host = parse_url($author, PHP_URL_HOST);
-// $id_host = parse_url($object_data['id'], PHP_URL_HOST);
-// if ($author_host == $id_host) {
-// Logger::info('Valid hosts', ['type' => $type, 'host' => $id_host]);
-// } else {
-// Logger::notice('Differing hosts on author and id', ['type' => $type, 'author' => $author_host, 'id' => $id_host]);
-// $trust_source = false;
-// }
-// }
-
$account = Contact::selectFirstAccount(['platform'], ['nurl' => Strings::normaliseLink($actor)]);
$platform = $account['platform'] ?? '';
return $object_data;
}
+ /**
+ * Check if the received message is a direct message
+ *
+ * @param array $object_data
+ * @param array $activity
+ * @return boolean
+ */
+ private static function checkForDirectMessage(array $object_data, array $activity): bool
+ {
+ if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) {
+ return true;
+ }
+
+ if ($object_data['id'] != $object_data['reply-to-id']) {
+ return false;
+ }
+
+ if (JsonLD::fetchElement($activity, 'litepub:directMessage')) {
+ return true;
+ }
+
+ if (!empty($object_data['attachments'])) {
+ return false;
+ }
+
+ if (!empty($object_data['receiver_urls']['as:cc']) || empty($object_data['receiver_urls']['as:to'])) {
+ return false;
+ }
+
+ if ((count($object_data['receiver_urls']['as:to']) != 1) || !User::getIdForURL($object_data['receiver_urls']['as:to'][0])) {
+ return false;
+ }
+
+ $mentions = 0;
+ foreach ($object_data['tags'] as $mention) {
+ if ($mention['type'] != 'Mention') {
+ continue;
+ }
+ if (!User::getIdForURL($mention['href'])) {
+ return false;
+ }
+ ++$mentions;
+ }
+
+ if ($mentions > 1) {
+ return false;
+ }
+
+ return true;
+ }
+
+ private static function setChatData(array $object_data, array $receivers): array
+ {
+ if (count($receivers) != 1) {
+ return $object_data;
+ }
+
+ $user = User::getById(array_key_first($receivers), ['language']);
+ $l10n = DI::l10n()->withLang($user['language']);
+ $object_data['name'] = $l10n->t('Chat');
+
+ $mail = DBA::selectFirst('mail', ['uri'], ['uid' => array_key_first($receivers), 'title' => $object_data['name']], ['order' => ['id' => true]]);
+ if (!empty($mail['uri'])) {
+ $object_data['reply-to-id'] = $mail['uri'];
+ }
+
+ $object_data['directmessage'] = true;
+ Logger::debug('Got Misskey Chat');
+ return $object_data;
+ }
+
/**
* Fetches the first user id from the receiver array
*
}
}
+ // Lemmy announces activities.
+ // To simplify the further processing, we modify the received object.
+ // For announced "create" activities we remove the middle layer.
+ // For the rest (like, dislike, update, ...) we just process the activity directly.
+ $original_actor = '';
+ $object_type = JsonLD::fetchElement($activity['as:object'] ?? [], '@type');
+ if (($type == 'as:Announce') && !empty($object_type) && !in_array($object_type, self::CONTENT_TYPES) && self::isGroup($actor)) {
+ $object_object_type = JsonLD::fetchElement($activity['as:object']['as:object'] ?? [], '@type');
+ if (in_array($object_type, ['as:Create']) && in_array($object_object_type, self::CONTENT_TYPES)) {
+ Logger::debug('Replace "create" activity with inner object', ['type' => $object_type, 'object_type' => $object_object_type]);
+ $activity['as:object'] = $activity['as:object']['as:object'];
+ } elseif (in_array($object_type, array_merge(self::ACTIVITY_TYPES, ['as:Delete', 'as:Undo', 'as:Update']))) {
+ Logger::debug('Change announced activity to activity', ['type' => $object_type]);
+ $original_actor = $actor;
+ $type = $object_type;
+ $activity = $activity['as:object'];
+ } else {
+ Logger::info('Unhandled announced activity', ['type' => $object_type, 'object_type' => $object_object_type]);
+ }
+ }
+
// $trust_source is called by reference and is set to true if the content was retrieved successfully
- $object_data = self::prepareObjectData($activity, $uid, $push, $trust_source);
+ $object_data = self::prepareObjectData($activity, $uid, $push, $trust_source, $original_actor);
if (empty($object_data)) {
Logger::info('No object data found', ['activity' => $activity]);
return true;
}
- // Lemmy is announcing activities.
- // We are changing the announces into regular activities.
- if (($type == 'as:Announce') && in_array($object_data['type'] ?? '', array_merge(self::ACTIVITY_TYPES, ['as:Delete', 'as:Undo', 'as:Update']))) {
- Logger::debug('Change type of announce to activity', ['type' => $object_data['type']]);
- $type = $object_data['type'];
- }
-
if (!empty($body) && empty($object_data['raw'])) {
$object_data['raw'] = $body;
}
$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_ANNOUNCE]);
+ $decouple = DI::config()->get('system', 'decoupled_receiver') && !in_array($completion, [self::COMPLETION_MANUAL, self::COMPLETION_ANNOUNCE]) && empty($object_data['directmessage']);
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);
return true;
}
- if (!empty($object_data['entry-id']) && $decouple && ($push || ($completion == self::COMPLETION_RELAY))) {
+ if (!empty($object_data['entry-id']) && $decouple && ($push || in_array($completion, [self::COMPLETION_RELAY, self::COMPLETION_ASYNC]))) {
if (Queue::isProcessable($object_data['entry-id'])) {
// We delay by 5 seconds to allow to accumulate all receivers
$delayed = date(DateTimeFormat::MYSQL, time() + 5);
return true;
}
+ /**
+ * Checks if the provided actor is a group account
+ *
+ * @param string $actor
+ * @return boolean
+ */
+ private static function isGroup(string $actor): bool
+ {
+ $profile = APContact::getByURL($actor);
+ return ($profile['type'] ?? '') == 'Group';
+ }
+
/**
* Route activities
*
* @param boolean $unknown "true" if the activity is unknown, "false" if it is unhandled
* @param string $type Activity type
* @param array $object_data Preprocessed array that is generated out of the received activity
- * @param array $activity Array with activity data
+ * @param array $activity Array with activity data
* @param string $body The unprocessed body
* @param integer $uid User ID
* @param boolean $trust_source Do we trust the source?
*
* @return int user id
*/
- public static function getBestUserForActivity(array $activity): int
+ private static function getBestUserForActivity(array $activity, string $actor): int
{
$uid = 0;
- $actor = JsonLD::fetchElement($activity, 'as:actor', '@id') ?? '';
+ $actor = $actor ?: JsonLD::fetchElement($activity, 'as:actor', '@id') ?? '';
$receivers = self::getReceivers($activity, $actor, [], false, false);
foreach ($receivers as $receiver) {
{
$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;
foreach ($receiver_list as $receiver) {
if ($receiver == 'Public') {
- Logger::warning('Not compacted public collection found', ['activity' => $activity, 'callstack' => System::callstack(20)]);
+ Logger::warning('Not compacted public collection found', ['activity' => $activity]);
$receiver = ActivityPub::PUBLIC_COLLECTION;
}
if ($receiver == self::PUBLIC_COLLECTION) {
if (!empty($actor)) {
$profile = APContact::getByURL($actor);
$followers = $profile['followers'] ?? '';
- $is_forum = ($actor['type'] ?? '') == 'Group';
+ $isGroup = ($profile['type'] ?? '') == 'Group';
if ($push) {
Contact::updateByUrlIfNeeded($actor);
}
} else {
Logger::info('Empty actor', ['activity' => $activity]);
$followers = '';
- $is_forum = false;
+ $isGroup = false;
+ }
+
+ $parent_followers = '';
+ $parent = Post::selectFirstPost(['parent-author-link'], ['uri' => $reply]);
+ if (!empty($parent['parent-author-link'])) {
+ $parent_profile = APContact::getByURL($parent['parent-author-link']);
+ if (!in_array($parent_profile['followers'] ?? '', ['', $followers])) {
+ $parent_followers = $parent_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;
}
// Fetch the receivers for the public and the followers collection
- if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$is_forum)) && !empty($actor)) {
- $receivers = self::getReceiverForActor($actor, $tags, $receivers, $follower_target, $profile);
+ if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$isGroup) || ($isGroup && ($element == 'as:audience'))) && !empty($profile)) {
+ $receivers = self::getReceiverForActor($tags, $receivers, $follower_target, $profile);
+ continue;
+ }
+
+ if ($receiver == $parent_followers) {
+ $receivers = self::getReceiverForActor([], $receivers, $follower_target, $parent_profile);
continue;
}
$condition = ['nurl' => Strings::normaliseLink($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
'network' => $networks, 'archive' => false, 'pending' => false, 'uid' => $contact['uid']];
- // Forum posts are only accepted from forum contacts
+ // Group posts are only accepted from group contacts
if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
$condition['rel'] = [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER];
}
case 'as:bcc':
$type = self::TARGET_BCC;
break;
+ case 'as:audience':
+ $type = self::TARGET_AUDIENCE;
+ break;
}
$receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $type];
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.
+ // We always process deletion activities.
+ $activity_type = JsonLD::fetchElement($activity, '@type');
if (empty($receivers) && $fetch_unlisted && Contact::isPlatform($actor, 'birdsitelive')) {
$receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
$receivers[-1] = ['uid' => -1, 'type' => self::TARGET_GLOBAL];
Logger::notice('Post from "birdsitelive" is set to "unlisted"', ['id' => JsonLD::fetchElement($activity, '@id')]);
+ } elseif (empty($receivers) && in_array($activity_type, ['as:Delete', 'as:Undo'])) {
+ $receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
} elseif (empty($receivers)) {
- Logger::notice('Post has got no receivers', ['fetch_unlisted' => $fetch_unlisted, 'actor' => $actor, 'id' => JsonLD::fetchElement($activity, '@id'), 'type' => JsonLD::fetchElement($activity, '@type')]);
+ Logger::notice('Post has got no receivers', ['fetch_unlisted' => $fetch_unlisted, 'actor' => $actor, 'id' => JsonLD::fetchElement($activity, '@id'), 'type' => $activity_type]);
}
return $receivers;
/**
* Fetch the receiver list of a given actor
*
- * @param string $actor
* @param array $tags
* @param array $receivers
* @param integer $target_type
* @return array with receivers (user id)
* @throws \Exception
*/
- private static function getReceiverForActor(string $actor, array $tags, array $receivers, int $target_type, array $profile): array
+ private static function getReceiverForActor(array $tags, array $receivers, int $target_type, array $profile): array
{
$basecondition = ['rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER],
'network' => Protocol::FEDERATED, 'archive' => false, 'pending' => false];
- if (!empty($profile['uri-id'])) {
- $condition = DBA::mergeConditions($basecondition, ["`uri-id` = ? AND `uid` != ?", $profile['uri-id'], 0]);
- $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
- while ($contact = DBA::fetch($contacts)) {
- if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
- $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
- }
- }
- DBA::close($contacts);
- } else {
- // This part will only be called while post update 1426 wasn't finished
- $condition = DBA::mergeConditions($basecondition, ["`nurl` = ? AND `uid` != ?", Strings::normaliseLink($actor), 0]);
- $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
- while ($contact = DBA::fetch($contacts)) {
- if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
- $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
- }
- }
- DBA::close($contacts);
-
- // The queries are split because of performance issues
- $condition = DBA::mergeConditions($basecondition, ["`alias` IN (?, ?) AND `uid` != ?", Strings::normaliseLink($actor), $actor, 0]);
- $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
- while ($contact = DBA::fetch($contacts)) {
- if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
- $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
- }
+ $condition = DBA::mergeConditions($basecondition, ["`uri-id` = ? AND `uid` != ?", $profile['uri-id'], 0]);
+ $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
+ $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
}
- DBA::close($contacts);
}
+ DBA::close($contacts);
+
return $receivers;
}
}
/**
- * 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
return false;
}
- // Lemmy is resharing "create" activities instead of content
- // We fetch the content from the activity.
- if (in_array($type, ['as:Create'])) {
- $object = $object['as:object'];
- $type = JsonLD::fetchElement($object, '@type');
- if (empty($type)) {
- Logger::info('Empty type');
- return 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);
+ $object_data = self::processObject($object, '');
if (!empty($data)) {
$object_data['raw-object'] = json_encode($data);
continue;
}
- $element = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type') ?? ''),
+ $element = [
+ 'type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type') ?? ''),
'href' => JsonLD::fetchElement($tag, 'as:href', '@id'),
- 'name' => JsonLD::fetchElement($tag, 'as:name', '@value')];
+ 'name' => JsonLD::fetchElement($tag, 'as:name', '@value')
+ ];
if (empty($element['type'])) {
continue;
}
$url = JsonLD::fetchElement($emoji['as:icon'], 'as:url', '@id');
- $element = ['name' => JsonLD::fetchElement($emoji, 'as:name', '@value'),
- 'href' => $url];
+ $element = [
+ 'name' => JsonLD::fetchElement($emoji, 'as:name', '@value'),
+ 'href' => $url
+ ];
$emojilist[] = $element;
}
'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')
/**
* Fetches data from the object part of an activity
*
- * @param array $object
+ * @param array $object
+ * @param string $actor
*
* @return array|bool Object data or FALSE if $object does not contain @id element
* @throws \Exception
*/
- private static function processObject(array $object)
+ private static function processObject(array $object, string $actor)
{
if (!JsonLD::fetchElement($object, '@id')) {
return false;
$object_data = self::getObjectDataFromActivity($object);
- $receiverdata = self::getReceivers($object, $object_data['actor'] ?? '', $object_data['tags'], true, false);
+ $receiverdata = self::getReceivers($object, $actor ?: $object_data['actor'] ?? '', $object_data['tags'], true, false);
$receivers = $reception_types = [];
foreach ($receiverdata as $key => $data) {
$receivers[$key] = $data['uid'];
$object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag') ?? []);
$object_data['emojis'] = self::processEmojis(JsonLD::fetchElementArray($object, 'as:tag', null, '@type', 'toot:Emoji') ?? []);
$object_data['languages'] = self::processLanguages(JsonLD::fetchElementArray($object, 'sc:inLanguage') ?? []);
+ $object_data['transmitted-languages'] = Processor::getPostLanguages($object);
$object_data['generator'] = JsonLD::fetchElement($object, 'as:generator', 'as:name', '@type', 'as:Application');
$object_data['generator'] = JsonLD::fetchElement($object_data, 'generator', '@value');
$object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url', '@id');
projects / friendica.git / blobdiff