clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into api4

Browse Source
This commit is contained in:
Michael
2021-11-18 20:15:57 +00:00
parent 15af14aea4 85d162d1d2
commit b67c10812a
272 changed files with 989 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Module/Api/Twitter/Account/RateLimitStatus.php
View File

@@ -30,9 +30,9 @@ use Friendica\Util\DateTimeFormat;
*/
class RateLimitStatus extends BaseApi
{
public static function rawContent(array $parameters = [])
public function rawContent()
{
if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) {
if (!empty($this->parameters['extension']) && ($this->parameters['extension'] == 'xml')) {
$hash = [
'remaining-hits' => '150',
'@attributes' => ["type" => "integer"],
@@ -52,6 +52,6 @@ class RateLimitStatus extends BaseApi
];
}
DI::apiResponse()->exit('hash', ['hash' => $hash], $parameters['extension'] ?? null);
DI::apiResponse()->exit('hash', ['hash' => $hash], $this->parameters['extension'] ?? null);
}
}

4
src/Module/Api/Twitter/ContactEndpoint.php
View File

@@ -35,9 +35,9 @@ abstract class ContactEndpoint extends BaseApi
const DEFAULT_COUNT = 20;
const MAX_COUNT = 200;
public static function init(array $parameters = [])
public function init()
{
parent::init($parameters);
parent::init();
self::checkAllowedScope(self::SCOPE_READ);
}

2
src/Module/Api/Twitter/Followers/Ids.php
View File

@@ -30,7 +30,7 @@ use Friendica\Module\Api\Twitter\ContactEndpoint;
*/
class FollowersIds extends ContactEndpoint
{
public static function rawContent(array $parameters = [])
public function rawContent()
{
// Expected value for user_id parameter: public/user contact id
$contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT);

2
src/Module/Api/Twitter/Followers/Lists.php
View File

@@ -30,7 +30,7 @@ use Friendica\Module\Api\Twitter\ContactEndpoint;
*/
class FollowersList extends ContactEndpoint
{
public static function rawContent(array $parameters = [])
public function rawContent()
{
// Expected value for user_id parameter: public/user contact id
$contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT);

2
src/Module/Api/Twitter/Friends/Ids.php
View File

@@ -30,7 +30,7 @@ use Friendica\Module\Api\Twitter\ContactEndpoint;
*/
class Ids extends ContactEndpoint
{
public static function rawContent(array $parameters = [])
public function rawContent()
{
// Expected value for user_id parameter: public/user contact id
$contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT);

2
src/Module/Api/Twitter/Friends/Lists.php
View File

@@ -30,7 +30,7 @@ use Friendica\Module\Api\Twitter\ContactEndpoint;
*/
class Lists extends ContactEndpoint
{
public static function rawContent(array $parameters = [])
public function rawContent()
{
// Expected value for user_id parameter: public/user contact id
$contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT);

4
src/Module/Api/Twitter/SavedSearches.php
View File

@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
*/
class SavedSearches extends BaseApi
{
public static function rawContent(array $parameters = [])
public function rawContent()
{
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
@@ -45,6 +45,6 @@ class SavedSearches extends BaseApi
DBA::close($terms);
DI::apiResponse()->exit('terms', ['terms' => $result], $parameters['extension'] ?? null);
DI::apiResponse()->exit('terms', ['terms' => $result], $this->parameters['extension'] ?? null);
}
}