From: Michael Date: Thu, 21 Apr 2022 04:29:08 +0000 (+0000) Subject: Issue 11427: id values of OrderedCollections have to contain the page number X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eb1f38df228544324934fc21d8509c7735a5afe6;p=friendica.git Issue 11427: id values of OrderedCollections have to contain the page number --- diff --git a/src/Module/ActivityPub/Featured.php b/src/Module/ActivityPub/Featured.php index a4b8c3fef1..d525e7d69a 100644 --- a/src/Module/ActivityPub/Featured.php +++ b/src/Module/ActivityPub/Featured.php @@ -42,7 +42,7 @@ class Featured extends BaseModule throw new \Friendica\Network\HTTPException\NotFoundException(); } - $page = $request['page'] ?? null; + $page = !empty($request['page']) ? (int)$request['page'] : null; $featured = ActivityPub\Transmitter::getFeatured($owner, $page); diff --git a/src/Module/ActivityPub/Followers.php b/src/Module/ActivityPub/Followers.php index b04d1976e0..48236da301 100644 --- a/src/Module/ActivityPub/Followers.php +++ b/src/Module/ActivityPub/Followers.php @@ -45,7 +45,7 @@ class Followers extends BaseModule throw new \Friendica\Network\HTTPException\NotFoundException(); } - $page = $_REQUEST['page'] ?? null; + $page = !empty($request['page']) ? (int)$request['page'] : null; $followers = ActivityPub\Transmitter::getContacts($owner, [Contact::FOLLOWER, Contact::FRIEND], 'followers', $page, (string)HTTPSignature::getSigner('', $_SERVER)); diff --git a/src/Module/ActivityPub/Following.php b/src/Module/ActivityPub/Following.php index e3ae10e87e..50d4a0824a 100644 --- a/src/Module/ActivityPub/Following.php +++ b/src/Module/ActivityPub/Following.php @@ -43,7 +43,7 @@ class Following extends BaseModule throw new \Friendica\Network\HTTPException\NotFoundException(); } - $page = $_REQUEST['page'] ?? null; + $page = !empty($request['page']) ? (int)$request['page'] : null; $following = ActivityPub\Transmitter::getContacts($owner, [Contact::SHARING, Contact::FRIEND], 'following', $page); diff --git a/src/Module/ActivityPub/Outbox.php b/src/Module/ActivityPub/Outbox.php index 4bc1ca6930..47ff2a8fc8 100644 --- a/src/Module/ActivityPub/Outbox.php +++ b/src/Module/ActivityPub/Outbox.php @@ -43,7 +43,7 @@ class Outbox extends BaseModule throw new \Friendica\Network\HTTPException\NotFoundException(); } - $page = $_REQUEST['page'] ?? null; + $page = !empty($request['page']) ? (int)$request['page'] : null; $requester = HTTPSignature::getSigner('', $_SERVER); $outbox = ActivityPub\Transmitter::getOutbox($owner, $page, $requester); diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index b86f94715c..e3df1a7a32 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -146,16 +146,16 @@ class Transmitter /** * Collects a list of contacts of the given owner * - * @param array $owner Owner array - * @param int|array $rel The relevant value(s) contact.rel should match - * @param string $module The name of the relevant AP endpoint module (followers|following) - * @param integer $page Page number - * @param string $requester URL of the requester + * @param array $owner Owner array + * @param array $rel The relevant value(s) contact.rel should match + * @param string $module The name of the relevant AP endpoint module (followers|following) + * @param integer $page Page number + * @param string $requester URL of the requester * * @return array of owners * @throws \Exception */ - public static function getContacts($owner, $rel, $module, $page = null, string $requester = null) + public static function getContacts(array $owner, array $rel, string $module, int $page = null, string $requester = null) { $parameters = [ 'rel' => $rel, @@ -179,6 +179,10 @@ class Transmitter $data['type'] = 'OrderedCollection'; $data['totalItems'] = $total; + if (!empty($page)) { + $data['id'] .= '?' . http_build_query(['page' => $page]); + } + // When we hide our friends we will only show the pure number but don't allow more. $show_contacts = empty($owner['hide-friends']); @@ -203,7 +207,7 @@ class Transmitter } DBA::close($contacts); - if (!empty($list)) { + if (count($list) == 100) { $data['next'] = DI::baseUrl() . $modulePath . $owner['nickname'] . '?page=' . ($page + 1); } @@ -226,7 +230,7 @@ class Transmitter * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function getOutbox($owner, $page = null, $requester = '') + public static function getOutbox(array $owner, int $page = null, string $requester = '') { $condition = ['private' => [Item::PUBLIC, Item::UNLISTED]]; @@ -258,6 +262,10 @@ class Transmitter $data['type'] = 'OrderedCollection'; $data['totalItems'] = $count; + if (!empty($page)) { + $data['id'] .= '?' . http_build_query(['page' => $page]); + } + if (empty($page)) { $data['first'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1'; } else { @@ -276,7 +284,7 @@ class Transmitter } DBA::close($items); - if (!empty($list)) { + if (count($list) == 20) { $data['next'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1); } @@ -298,7 +306,7 @@ class Transmitter * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function getFeatured($owner, $page = null) + public static function getFeatured(array $owner, int $page = null) { $condition = ["`uri-id` IN (SELECT `uri-id` FROM `collection-view` WHERE `cid` = ? AND `type` = ?)", Contact::getIdForURL($owner['url'], 0, false), Post\Collection::FEATURED]; @@ -321,6 +329,10 @@ class Transmitter $data['type'] = 'OrderedCollection'; $data['totalItems'] = $count; + if (!empty($page)) { + $data['id'] .= '?' . http_build_query(['page' => $page]); + } + if (empty($page)) { $data['first'] = DI::baseUrl() . '/featured/' . $owner['nickname'] . '?page=1'; } else { @@ -339,7 +351,7 @@ class Transmitter } DBA::close($items); - if (!empty($list)) { + if (count($list) == 20) { $data['next'] = DI::baseUrl() . '/featured/' . $owner['nickname'] . '?page=' . ($page + 1); }