keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't send the header

Browse source
This commit is contained in:
Michael 2022-12-12 03:13:24 +00:00
parent a2f386cd2f
commit 5312b23f03
4 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Api/Twitter/Followers/Lists.php
View file

@ -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]);
}
}

6
src/Module/Api/Twitter/Friends/Lists.php
View file

@ -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]);
}
}

3
src/Module/Api/Twitter/Friendships/Incoming.php
View file

@ -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]);
}

22
src/Module/BaseApi.php
View file

@ -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);
}
}
/**