const TARGET_ANSWER = 6;
const TARGET_GLOBAL = 7;
- /**
- * Checks if the web request is done for the AP protocol
- *
- * @return bool is it AP?
- */
- public static function isRequest()
- {
- return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
- stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
- }
-
/**
* Checks incoming message from the inbox
*
if (LDSignature::isSigned($activity)) {
$ld_signer = LDSignature::getSigner($activity);
if (empty($ld_signer)) {
- Logger::log('Invalid JSON-LD signature from ' . $actor, Logger::DEBUG);
+ Logger::info('Invalid JSON-LD signature from ' . $actor);
} elseif ($ld_signer != $http_signer) {
$signer[] = $ld_signer;
}
if (!empty($ld_signer && ($actor == $http_signer))) {
- Logger::log('The HTTP and the JSON-LD signature belong to ' . $ld_signer, Logger::DEBUG);
+ Logger::info('The HTTP and the JSON-LD signature belong to ' . $ld_signer);
$trust_source = true;
} elseif (!empty($ld_signer)) {
- Logger::log('JSON-LD signature is signed by ' . $ld_signer, Logger::DEBUG);
+ Logger::info('JSON-LD signature is signed by ' . $ld_signer);
$trust_source = true;
} elseif ($actor == $http_signer) {
- Logger::log('Bad JSON-LD signature, but HTTP signer fits the actor.', Logger::DEBUG);
+ Logger::info('Bad JSON-LD signature, but HTTP signer fits the actor.');
$trust_source = true;
} else {
- Logger::log('Invalid JSON-LD signature and the HTTP signer is different.', Logger::DEBUG);
+ Logger::info('Invalid JSON-LD signature and the HTTP signer is different.');
$trust_source = false;
}
} elseif ($actor == $http_signer) {
- Logger::log('Trusting post without JSON-LD signature, The actor fits the HTTP signer.', Logger::DEBUG);
+ Logger::info('Trusting post without JSON-LD signature, The actor fits the HTTP signer.');
$trust_source = true;
} else {
- Logger::log('No JSON-LD signature, different actor.', Logger::DEBUG);
+ Logger::info('No JSON-LD signature, different actor.');
$trust_source = false;
}
$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
if (empty($object_id)) {
- Logger::log('No object found', Logger::DEBUG);
+ Logger::info('No object found');
return [];
}
// Always fetch on "Announce"
$object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source && ($type != 'as:Announce'), $uid);
if (empty($object_data)) {
- Logger::log("Object data couldn't be processed", Logger::DEBUG);
+ Logger::info("Object data couldn't be processed");
return [];
}
}
}
- Logger::log('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], Logger::DEBUG);
+ Logger::info('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id']);
return $object_data;
}
break;
default:
- Logger::log('Unknown activity: ' . $type . ' ' . $object_data['object_type'], Logger::DEBUG);
+ Logger::info('Unknown activity: ' . $type . ' ' . $object_data['object_type']);
break;
}
}
$data = ActivityPub::fetchContent($object_id, $uid);
if (!empty($data)) {
$object = JsonLD::compact($data);
- Logger::log('Fetched content for ' . $object_id, Logger::DEBUG);
+ Logger::info('Fetched content for ' . $object_id);
} else {
- Logger::log('Empty content for ' . $object_id . ', check if content is available locally.', Logger::DEBUG);
+ Logger::info('Empty content for ' . $object_id . ', check if content is available locally.');
$item = Post::selectFirst(Item::DELIVER_FIELDLIST, ['uri' => $object_id]);
if (!DBA::isResult($item)) {
- Logger::log('Object with url ' . $object_id . ' was not found locally.', Logger::DEBUG);
+ Logger::info('Object with url ' . $object_id . ' was not found locally.');
return false;
}
- Logger::log('Using already stored item for url ' . $object_id, Logger::DEBUG);
+ Logger::info('Using already stored item for url ' . $object_id);
$data = ActivityPub\Transmitter::createNote($item);
$object = JsonLD::compact($data);
}
return false;
}
} else {
- Logger::log('Using original object for url ' . $object_id, Logger::DEBUG);
+ Logger::info('Using original object for url ' . $object_id);
}
$type = JsonLD::fetchElement($object, '@type');
return self::fetchObject($object_id, [], false, $uid);
}
- Logger::log('Unhandled object type: ' . $type, Logger::DEBUG);
+ Logger::info('Unhandled object type: ' . $type);
return false;
}
$filetype = strtolower(substr($mediatype, 0, strpos($mediatype, '/')));
if ($filetype == 'audio') {
- $attachments[$filetype] = ['type' => $mediatype, 'url' => $href, 'height' => null, 'size' => null];
+ $attachments[] = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => null, 'size' => null, 'name' => ''];
} elseif ($filetype == 'video') {
$height = (int)JsonLD::fetchElement($url, 'as:height', '@value');
// PeerTube audio-only track
}
$size = (int)JsonLD::fetchElement($url, 'pt:size', '@value');
- // For embedded video we take the smallest available size
- if (!empty($attachments[$mediatype]['size']) && ($size > $attachments[$mediatype]['size'])) {
- continue;
- }
-
- $attachments[$filetype] = ['type' => $mediatype, 'url' => $href, 'height' => $height, 'size' => $size];
+ $attachments[] = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'size' => $size, 'name' => ''];
} elseif (in_array($mediatype, ['application/x-bittorrent', 'application/x-bittorrent;x-scheme-handler/magnet'])) {
$height = (int)JsonLD::fetchElement($url, 'as:height', '@value');
continue;
}
- $attachments[$mediatype] = ['type' => $mediatype, 'url' => $href, 'height' => $height, 'size' => null];
+ $attachments[$mediatype] = ['type' => $mediatype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'size' => null, 'name' => ''];
} elseif ($mediatype == 'application/x-mpegURL') {
// PeerTube exception, actual video link is in the tags of this URL element
$attachments = array_merge($attachments, self::processAttachmentUrls($url['as:tag']));
}
}
- return $attachments;
+ return array_values($attachments);
}
/**
$object_data = self::getSource($object, $object_data);
$object_data['start-time'] = JsonLD::fetchElement($object, 'as:startTime', '@value');
$object_data['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value');
- $object_data['adjust'] = JsonLD::fetchElement($object, 'dfrn:adjust', '@value');
$object_data['location'] = $location;
$object_data['latitude'] = JsonLD::fetchElement($object, 'as:location', 'as:latitude', '@type', 'as:Place');
$object_data['latitude'] = JsonLD::fetchElement($object_data, 'latitude', '@value');
if (in_array($object_data['object_type'], ['as:Audio', 'as:Video'])) {
$object_data['alternate-url'] = self::extractAlternateUrl($object['as:url'] ?? []) ?: $object_data['alternate-url'];
-
- $attachments = self::processAttachmentUrls($object['as:url'] ?? []);
- foreach ($attachments as $type => $attachment) {
- $object_data['attachments'][] = [
- 'type' => $type,
- 'mediaType' => $attachment['type'],
- 'height' => $attachment['height'],
- 'size' => $attachment['size'],
- 'name' => '',
- 'url' => $attachment['url']
- ];
- }
+ $object_data['attachments'] = array_merge($object_data['attachments'], self::processAttachmentUrls($object['as:url'] ?? []));
}
$receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
projects / friendica.git / blobdiff