} 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;
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);
* @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;
+ }
+
+ /**
+ * Fetches data from the object part of an client to server activity
+ *
+ * @param array $object
+ *
+ * @return array Object data
+ */
+ private static function processC2SObject(array $object): array
+ {
+ $object_data = self::getObjectDataFromActivity($object);
+
+ $object_data['target'] = self::getTargets($object, $object_data['actor'] ?? '');
+ $object_data['receiver'] = [];
+
+ return $object_data;
+ }
+
+ /**
+ * Create an object data array from a given activity
+ *
+ * @param array $object
+ *
+ * @return array Object data
+ */
+ private 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)
+ /**
+ * Process client to server activities
+ *
+ * @param array $activity
+ * @param integer $uid
+ * @param array $application
+ * @return array
+ */
+ public static function processC2SActivity(array $activity, int $uid, array $application): array
{
$ldactivity = JsonLD::compact($activity);
if (empty($ldactivity)) {
Logger::notice('Invalid activity', ['activity' => $activity, 'uid' => $uid]);
- return;
+ return [];
}
$type = JsonLD::fetchElement($ldactivity, '@type');
if (!$type) {
Logger::notice('Empty type', ['activity' => $ldactivity, 'uid' => $uid]);
- return;
+ 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;
+ 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();
+ return self::routeC2SActivities($type, $object_type, $object_id, $uid, $application, $ldactivity);
}
+ /**
+ * Accumulate the targets and visibility of this post
+ *
+ * @param array $object
+ * @param string $actor
+ * @return array
+ */
private static function getTargets(array $object, string $actor): array
{
$profile = APContact::getByURL($actor);
return $targets;
}
- private static function routeC2SActivities(string $type, string $object_type, string $object_id, int $uid, array $application, array $ldactivity)
+ /**
+ * Route client to server activities
+ *
+ * @param string $type
+ * @param string $object_type
+ * @param string $object_id
+ * @param integer $uid
+ * @param array $application
+ * @param array $ldactivity
+ * @return array
+ */
+ private static function routeC2SActivities(string $type, string $object_type, string $object_id, int $uid, array $application, array $ldactivity): array
{
switch ($type) {
case 'as:Create':
if (in_array($object_type, self::CONTENT_TYPES)) {
- self::createContent($uid, $application, $ldactivity);
+ return 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);
+ return 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);
+ return self::followAccount($uid, $object_id, $ldactivity);
}
break;
}
+ return [];
}
- private static function createContent(int $uid, array $application, array $ldactivity)
+ /**
+ * Create a new post or comment
+ *
+ * @param integer $uid
+ * @param array $application
+ * @param array $ldactivity
+ * @return array
+ */
+ private static function createContent(int $uid, array $application, array $ldactivity): array
{
- $object_data = self::processObject($ldactivity['as:object'], true);
+ $object_data = self::processC2SObject($ldactivity['as:object']);
$item = Processor::processC2SContent($object_data, $application, $uid);
Logger::debug('Got data', ['item' => $item, 'object' => $object_data]);
if (!empty($id)) {
$item = Post::selectFirst(['uri-id'], ['id' => $id]);
if (!empty($item['uri-id'])) {
- System::jsonExit(Transmitter::createActivityFromItem($id));
+ return Transmitter::createActivityFromItem($id);
}
}
+ return [];
}
- private static function updateContent(int $uid, string $object_id, array $application, array $ldactivity)
+ /**
+ * Update an existing post or comment
+ *
+ * @param integer $uid
+ * @param string $object_id
+ * @param array $application
+ * @param array $ldactivity
+ * @return array
+ */
+ private static function updateContent(int $uid, string $object_id, array $application, array $ldactivity):array
{
$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;
+ return [];
}
- $object_data = self::processObject($ldactivity['as:object'], true);
+ $object_data = self::processC2SObject($ldactivity['as:object']);
$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;
+ 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));
+ return Transmitter::createActivityFromItem($id);
}
- private static function followAccount($uid, $object_id, $ldactivity)
+ /**
+ * Follow a given account
+ * @todo Check the expected return value
+ *
+ * @param integer $uid
+ * @param string $object_id
+ * @param array $ldactivity
+ * @return array
+ */
+ private static function followAccount(int $uid, string $object_id, array $ldactivity): array
{
-
+ return [];
}
}
projects / friendica.git / blobdiff