namespace Friendica\Protocol;
-use Friendica\Util\JsonLD;
-use Friendica\Util\Network;
use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\User;
use Friendica\Util\HTTPSignature;
+use Friendica\Util\JsonLD;
/**
* ActivityPub Protocol class
* @return array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function fetchContent($url, $uid = 0)
+ public static function fetchContent(string $url, int $uid = 0)
{
- if (!empty($uid)) {
- return HTTPSignature::fetch($url, $uid);
- }
-
- $curlResult = Network::curl($url, false, ['accept_content' => 'application/activity+json, application/ld+json']);
- if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
- return false;
- }
-
- $content = json_decode($curlResult->getBody(), true);
-
- if (empty($content) || !is_array($content)) {
- return false;
- }
-
- return $content;
+ return HTTPSignature::fetch($url, $uid);
}
private static function getAccountType($apcontact)
{
$apcontact = APContact::getByURL($url, $update);
if (empty($apcontact)) {
- return false;
+ return [];
}
$profile = ['network' => Protocol::ACTIVITYPUB];
$profile['notify'] = $apcontact['inbox'];
$profile['poll'] = $apcontact['outbox'];
$profile['pubkey'] = $apcontact['pubkey'];
+ $profile['subscribe'] = $apcontact['subscribe'];
+ $profile['manually-approve'] = $apcontact['manually-approve'];
$profile['baseurl'] = $apcontact['baseurl'];
+ $profile['gsid'] = $apcontact['gsid'];
// Remove all "null" fields
foreach ($profile as $field => $content) {
$items = $data['orderedItems'];
} elseif (!empty($data['first']['orderedItems'])) {
$items = $data['first']['orderedItems'];
- } elseif (!empty($data['first']) && is_string($data['first'])) {
+ } elseif (!empty($data['first']) && is_string($data['first']) && ($data['first'] != $url)) {
return self::fetchItems($data['first'], $uid);
} else {
- $items = [];
+ return [];
}
if (!empty($data['next']) && is_string($data['next'])) {