From 5312b23f0389f9992a78366460478d41872f4719 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 12 Dec 2022 03:13:24 +0000 Subject: [PATCH] Don't send the header --- src/Module/Api/Twitter/Followers/Lists.php | 4 ++-- src/Module/Api/Twitter/Friends/Lists.php | 6 ++--- .../Api/Twitter/Friendships/Incoming.php | 3 +-- src/Module/BaseApi.php | 22 ++++++++++++++----- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/Module/Api/Twitter/Followers/Lists.php b/src/Module/Api/Twitter/Followers/Lists.php index 930114c47..04bddf83c 100644 --- a/src/Module/Api/Twitter/Followers/Lists.php +++ b/src/Module/Api/Twitter/Followers/Lists.php @@ -110,10 +110,10 @@ class Lists extends ContactEndpoint $ids = array_reverse($ids); } - self::setLinkHeader(); - $return = self::list($ids, $total_count, $uid, $cursor, $count, $skip_status, $include_user_entities); + $this->response->setHeader(self::getLinkHeader()); + $this->response->exit('lists', ['lists' => $return]); } } diff --git a/src/Module/Api/Twitter/Friends/Lists.php b/src/Module/Api/Twitter/Friends/Lists.php index 45c46f64d..1abce5364 100644 --- a/src/Module/Api/Twitter/Friends/Lists.php +++ b/src/Module/Api/Twitter/Friends/Lists.php @@ -77,7 +77,7 @@ class Lists extends ContactEndpoint } } else { $params = ['order' => ['cid' => true], 'limit' => $count]; - + $condition = ['relation-cid' => $cid, 'follows' => true]; $total_count = (int)DBA::count('contact-relation', $condition); @@ -110,10 +110,10 @@ class Lists extends ContactEndpoint $ids = array_reverse($ids); } - self::setLinkHeader(); - $return = self::list($ids, $total_count, $uid, $cursor, $count, $skip_status, $include_user_entities); + $this->response->setHeader(self::getLinkHeader()); + $this->response->exit('lists', ['lists' => $return]); } } diff --git a/src/Module/Api/Twitter/Friendships/Incoming.php b/src/Module/Api/Twitter/Friendships/Incoming.php index d34d79fae..89a7b4bce 100644 --- a/src/Module/Api/Twitter/Friendships/Incoming.php +++ b/src/Module/Api/Twitter/Friendships/Incoming.php @@ -21,7 +21,6 @@ namespace Friendica\Module\Api\Twitter\Friendships; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Module\Api\Twitter\ContactEndpoint; use Friendica\Module\BaseApi; @@ -81,7 +80,7 @@ class Incoming extends ContactEndpoint $return = self::ids($ids, $total_count, $cursor, $count, $stringify_ids); - self::setLinkHeader(); + $this->response->setHeader(self::getLinkHeader()); $this->response->exit('incoming', ['incoming' => $return]); } diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php index 47557928a..1d5249ac8 100644 --- a/src/Module/BaseApi.php +++ b/src/Module/BaseApi.php @@ -139,13 +139,13 @@ class BaseApi extends BaseModule } /** - * Set the "link" header with "next" and "prev" links - * @return void + * Get the "link" header with "next" and "prev" links + * @return string */ - protected static function setLinkHeader() + protected static function getLinkHeader(): string { if (empty(self::$boundaries)) { - return; + return ''; } $request = self::$request; @@ -164,7 +164,19 @@ class BaseApi extends BaseModule $prev = $command . '?' . http_build_query($prev_request); $next = $command . '?' . http_build_query($next_request); - header('Link: <' . $next . '>; rel="next", <' . $prev . '>; rel="prev"'); + return 'Link: <' . $next . '>; rel="next", <' . $prev . '>; rel="prev"'; + } + + /** + * Set the "link" header with "next" and "prev" links + * @return void + */ + protected static function setLinkHeader() + { + $header = self::getLinkHeader(); + if (!empty($header)) { + header($header); + } } /**