/**
* Checks incoming message from the inbox
*
- * @param $body
- * @param $header
+ * @param string $body Body string
+ * @param array $header Header lines
* @param integer $uid User ID
+ * @return void
* @throws \Exception
*/
- public static function processInbox($body, $header, $uid)
+ public static function processInbox(string $body, array $header, int $uid)
{
$activity = json_decode($body, true);
if (empty($activity)) {
$ldactivity = JsonLD::compact($activity);
- $actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id');
-
+ $actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id') ?? '';
$apcontact = APContact::getByURL($actor);
+
if (empty($apcontact)) {
Logger::notice('Unable to retrieve AP contact for actor - message is discarded', ['actor' => $actor]);
return;
* @param string $object_id Object ID of the the provided object
* @param integer $uid User ID
*
- * @return string with object type
+ * @return string with object type or NULL
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function fetchObjectType($activity, $object_id, $uid = 0)
+ private static function fetchObjectType(array $activity, string $object_id, int $uid = 0)
{
if (!empty($activity['as:object'])) {
$object_type = JsonLD::fetchElement($activity['as:object'], '@type');
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function prepareObjectData($activity, $uid, $push, &$trust_source)
+ public static function prepareObjectData(array $activity, int $uid, bool $push, bool &$trust_source): array
{
$id = JsonLD::fetchElement($activity, '@id');
if (!empty($id) && !$trust_source) {
* @param array $receivers Array with receivers
* @return integer user id;
*/
- public static function getFirstUserFromReceivers($receivers)
+ public static function getFirstUserFromReceivers(array $receivers): int
{
foreach ($receivers as $receiver) {
if (!empty($receiver)) {
* @param array $signer The signer of the post
* @throws \Exception
*/
- public static function processActivity($activity, string $body = '', int $uid = null, bool $trust_source = false, bool $push = false, array $signer = [])
+ public static function processActivity(array $activity, string $body = '', int $uid = null, bool $trust_source = false, bool $push = false, array $signer = [])
{
$type = JsonLD::fetchElement($activity, '@type');
if (!$type) {
$object_data['from-relay'] = $activity['from-relay'];
}
+ if (in_array('as:Question', [$object_data['object_type'] ?? '', $object_data['object_object_type'] ?? ''])) {
+ self::storeUnhandledActivity(false, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
+ }
+
switch ($type) {
case 'as:Create':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
- if ($object_data['object_type'] == 'as:Question') {
- self::storeUnhandledActivity(false, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
- }
$item = ActivityPub\Processor::createItem($object_data);
ActivityPub\Processor::postItem($object_data, $item);
} elseif (in_array($object_data['object_type'], ['pt:CacheFile'])) {
*
* @return int user id
*/
- public static function getBestUserForActivity(array $activity)
+ public static function getBestUserForActivity(array $activity): int
{
$uid = 0;
$actor = JsonLD::fetchElement($activity, 'as:actor', '@id') ?? '';
return $uid;
}
- public static function getReceiverURL($activity)
+ // @TODO Missing documentation
+ public static function getReceiverURL(array $activity): array
{
$urls = [];
* @return array with receivers (user id)
* @throws \Exception
*/
- private static function getReceivers($activity, $actor, $tags = [], $fetch_unlisted = false)
+ private static function getReceivers(array $activity, string $actor, array $tags = [], bool $fetch_unlisted = false): array
{
- $reply = $receivers = [];
+ $reply = $receivers = $profile = [];
// When it is an answer, we inherite the receivers from the parent
$replyto = JsonLD::fetchElement($activity, 'as:inReplyTo', '@id');
// 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);
+ $receivers = self::getReceiverForActor($actor, $tags, $receivers, $follower_target, $profile);
continue;
}
* @param array $tags
* @param array $receivers
* @param integer $target_type
+ * @param array $profile
*
* @return array with receivers (user id)
* @throws \Exception
*/
- private static function getReceiverForActor($actor, $tags, $receivers, $target_type)
+ private static function getReceiverForActor(string $actor, 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];
- $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];
+ 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);
-
- // 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];
+ 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];
+ }
+ }
+ DBA::close($contacts);
}
- DBA::close($contacts);
return $receivers;
}
* Tests if the contact is a valid receiver for this actor
*
* @param array $contact
- * @param string $actor
* @param array $tags
*
* @return bool with receivers (user id)
* @throws \Exception
*/
- private static function isValidReceiverForActor($contact, $tags)
+ private static function isValidReceiverForActor(array $contact, array $tags): bool
{
// Are we following the contact? Then this is a valid receiver
if (in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND])) {
* @param integer $cid Contact ID
* @param integer $uid User ID
* @param string $url Profile URL
+ * @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function switchContact($cid, $uid, $url)
+ public static function switchContact(int $cid, int $uid, string $url)
{
if (DBA::exists('contact', ['id' => $cid, 'network' => Protocol::ACTIVITYPUB])) {
Logger::info('Contact is already ActivityPub', ['id' => $cid, 'uid' => $uid, 'url' => $url]);
}
/**
- *
+ * @TODO Fix documentation and type-hints
*
* @param $receivers
* @param $actor
+ * @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
}
/**
- *
+ * @TODO Fix documentation and type-hints
*
* @param $object_data
* @param array $activity
*
* @return mixed
*/
- private static function addActivityFields($object_data, $activity)
+ private static function addActivityFields($object_data, array $activity)
{
if (!empty($activity['published']) && empty($object_data['published'])) {
$object_data['published'] = JsonLD::fetchElement($activity, 'as:published', '@value');
* @param array $languages
* @return array Languages
*/
- public static function processLanguages(array $languages)
+ public static function processLanguages(array $languages): array
{
if (empty($languages)) {
return [];
*
* @return array with tags in a simplified format
*/
- public static function processTags(array $tags)
+ public static function processTags(array $tags): array
{
$taglist = [];
* @param array $emojis
* @return array with emojis in a simplified format
*/
- private static function processEmojis(array $emojis)
+ private static function processEmojis(array $emojis): array
{
$emojilist = [];
*
* @return array Attachments in a simplified format
*/
- private static function processAttachments(array $attachments)
+ private static function processAttachments(array $attachments): array
{
$attachlist = [];
*
* @return array Questions in a simplified format
*/
- private static function processQuestion(array $object)
+ private static function processQuestion(array $object): array
{
$question = [];
return [];
}
- // @todo Check if "closed" is a thing, see here: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-closed
+ $closed = JsonLD::fetchElement($object, 'as:closed', '@value');
+ if (!empty($closed)) {
+ $question['end-time'] = $closed;
+ } else {
+ $question['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value');
+ }
+
$question['voters'] = (int)JsonLD::fetchElement($object, 'toot:votersCount', '@value');
$question['options'] = [];
* @param array $object
* @param array $object_data
*
- * @return array
+ * @return array Object data (?)
* @throws \Exception
*/
- private static function getSource($object, $object_data)
+ private static function getSource(array $object, array $object_data): array
{
$object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode');
$object_data['source'] = JsonLD::fetchElement($object_data, 'source', '@value');
*
* @param array $object
*
- * @return array
+ * @return array|bool Object data or FALSE if $object does not contain @id element
* @throws \Exception
*/
- private static function processObject($object)
+ private static function processObject(array $object)
{
if (!JsonLD::fetchElement($object, '@id')) {
return false;
$object_data['question'] = self::processQuestion($object);
}
- $receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
+ $receiverdata = self::getReceivers($object, $object_data['actor'] ?? '', $object_data['tags'], true);
$receivers = $reception_types = [];
foreach ($receiverdata as $key => $data) {
$receivers[$key] = $data['uid'];
projects / friendica.git / blobdiff