diff --git a/php/federator/api/fedusers/followers.php b/php/federator/api/fedusers/followers.php index cab059c..26fdbfb 100644 --- a/php/federator/api/fedusers/followers.php +++ b/php/federator/api/fedusers/followers.php @@ -101,6 +101,8 @@ class Followers implements \Federator\Api\FedUsers\FedUsersInterface } $followers->setFirst($baseUrl . '?page=0'); $followers->setLast($baseUrl . '?page=' . $lastPage); + } else { + $followers->setType('OrderedCollection'); } $obj = $followers->toObject(); diff --git a/php/federator/api/fedusers/following.php b/php/federator/api/fedusers/following.php index 1d25f5d..2fe4ff8 100644 --- a/php/federator/api/fedusers/following.php +++ b/php/federator/api/fedusers/following.php @@ -101,6 +101,8 @@ class Following implements \Federator\Api\FedUsers\FedUsersInterface } $following->setFirst($baseUrl . '?page=0'); $following->setLast($baseUrl . '?page=' . $lastPage); + } else { + $following->setType('OrderedCollection'); } $obj = $following->toObject(); diff --git a/php/federator/api/fedusers/outbox.php b/php/federator/api/fedusers/outbox.php index 9e66714..65b1dfc 100644 --- a/php/federator/api/fedusers/outbox.php +++ b/php/federator/api/fedusers/outbox.php @@ -72,6 +72,8 @@ class Outbox implements \Federator\Api\FedUsers\FedUsersInterface $outbox->setID($id); if ($page !== '') { $id .= '?page=' . urlencode($page); + } else { + $outbox->setType('OrderedCollection'); } if ($page === '' || $outbox->count() == 0) { $outbox->setFirst($id . '?page=0'); diff --git a/php/federator/data/activitypub/common/orderedcollectionpage.php b/php/federator/data/activitypub/common/orderedcollectionpage.php index 3d928ff..21838cc 100644 --- a/php/federator/data/activitypub/common/orderedcollectionpage.php +++ b/php/federator/data/activitypub/common/orderedcollectionpage.php @@ -19,6 +19,7 @@ class OrderedCollectionPage extends OrderedCollection { parent::__construct(); parent::addContext('https://www.w3.org/ns/activitystreams'); + $this->setType('OrderedCollectionPage'); } /** @@ -38,7 +39,7 @@ class OrderedCollectionPage extends OrderedCollection if ($this->partOf !== '') { $return['partOf'] = $this->partOf; } - $return['type'] = 'OrderedCollectionPage'; + $return['type'] = $this->getType(); return $return; } diff --git a/plugins/federator/contentnation.php b/plugins/federator/contentnation.php index daf2b50..a19aa9a 100644 --- a/plugins/federator/contentnation.php +++ b/plugins/federator/contentnation.php @@ -66,7 +66,7 @@ class ContentNation implements Connector [$response, $info] = \Federator\Main::getFromRemote($remoteURL, []); if ($info['http_code'] != 200) { - print_r($info); + error_log("ContentNation::getRemoteFollowersOfUser error retrieving followers for userId: $userId . Error: " . json_encode($info)); return false; } $r = json_decode($response, true); @@ -94,7 +94,7 @@ class ContentNation implements Connector [$response, $info] = \Federator\Main::getFromRemote($remoteURL, []); if ($info['http_code'] != 200) { - print_r($info); + error_log("ContentNation::getRemoteFollowingForUser error retrieving following for userId: $userId . Error: " . json_encode($info)); return false; } $r = json_decode($response, true); @@ -127,7 +127,7 @@ class ContentNation implements Connector } [$response, $info] = \Federator\Main::getFromRemote($remoteURL, []); if ($info['http_code'] != 200) { - print_r($info); + error_log("ContentNation::getRemotePostsByUser error retrieving activities for userId: $userId . Error: " . json_encode($info)); return false; } $r = json_decode($response, true);