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

Merge pull request #13456 from MrPetovan/bug/cors-headers-rawcontent 

Remove DI dependency for httpExit, httpError, jsonExit, jsonError and xmlExit
This commit is contained in:
Michael Vogel 2023-09-27 06:01:16 +02:00 committed by GitHub
parent e014729206 642baa1f2a
commit a2a1d852e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
216 changed files with 555 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.php
View File

@ -716,7 +716,7 @@ class App
} }
$this->logger->debug('Request processed sucessfully', ['response' => $response->getStatusCode(), 'address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); $this->logger->debug('Request processed sucessfully', ['response' => $response->getStatusCode(), 'address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
$page->exit($response); System::echoResponse($response);
} catch (HTTPException $e) { } catch (HTTPException $e) {
$this->logger->debug('Request processed with exception', ['response' => $e->getCode(), 'address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); $this->logger->debug('Request processed with exception', ['response' => $e->getCode(), 'address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
$httpException->rawContent($e); $httpException->rawContent($e);

34
src/App/Page.php
View File

@ -401,36 +401,6 @@ class Page implements ArrayAccess
$this->footerScripts[] = trim($url, '/'); $this->footerScripts[] = trim($url, '/');
} }
/**
* Directly exit with the current response (include setting all headers)
*
* @param ResponseInterface $response
*/
public function exit(ResponseInterface $response)
{
header(sprintf("HTTP/%s %s %s",
$response->getProtocolVersion(),
$response->getStatusCode(),
$response->getReasonPhrase())
);
foreach ($response->getHeaders() as $key => $header) {
if (is_array($header)) {
$header_str = implode(',', $header);
} else {
$header_str = $header;
}
if (empty($key)) {
header($header_str);
} else {
header("$key: $header_str");
}
}
echo $response->getBody();
}
/** /**
* Executes the creation of the current page and prints it to the screen * Executes the creation of the current page and prints it to the screen
* *
@ -526,7 +496,9 @@ class Page implements ArrayAccess
} }
if ($_GET["mode"] == "raw") { if ($_GET["mode"] == "raw") {
System::httpExit(substr($target->saveHTML(), 6, -8), Response::TYPE_HTML); $response->withBody(Utils::streamFor($target->saveHTML()));
System::echoResponse($response);
System::exit();
} }
} }

80
src/BaseModule.php
View File

@ -27,11 +27,13 @@ use Friendica\Capabilities\ICanCreateResponses;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Response; use Friendica\Module\Response;
use Friendica\Module\Special\HTTPException as ModuleHTTPException; use Friendica\Module\Special\HTTPException as ModuleHTTPException;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
use Friendica\Util\XML;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
@ -106,8 +108,7 @@ abstract class BaseModule implements ICanHandleRequests
*/ */
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
// echo ''; // $this->httpExit(...);
// exit;
} }
/** /**
@ -234,7 +235,8 @@ abstract class BaseModule implements ICanHandleRequests
$timestamp = microtime(true); $timestamp = microtime(true);
// "rawContent" is especially meant for technical endpoints. // "rawContent" is especially meant for technical endpoints.
// This endpoint doesn't need any theme initialization or other comparable stuff. // This endpoint doesn't need any theme initialization or
// templating and is expected to exit on its own if it is set.
$this->rawContent($request); $this->rawContent($request);
try { try {
@ -456,4 +458,76 @@ abstract class BaseModule implements ICanHandleRequests
return $tabs; return $tabs;
} }
/**
* This function adds the content and a content-type HTTP header to the output.
* After finishing the process is getting killed.
*
* @param string $content
* @param string $type
* @param string|null $content_type
* @return void
* @throws HTTPException\InternalServerErrorException
*/
public function httpExit(string $content, string $type = Response::TYPE_HTML, ?string $content_type = null)
{
$this->response->setType($type, $content_type);
$this->response->addContent($content);
System::echoResponse($this->response->generate());
System::exit();
}
/**
* Send HTTP status header and exit.
*
* @param integer $httpCode HTTP status result value
* @param string $message Error message. Optional.
* @param mixed $content Response body. Optional.
* @throws \Exception
*/
public function httpError(int $httpCode, string $message = '', $content = '')
{
if ($httpCode >= 400) {
$this->logger->debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'callstack' => System::callstack(20), 'method' => $this->args->getMethod(), 'agent' => $this->server['HTTP_USER_AGENT'] ?? '']);
}
$this->response->setStatus($httpCode, $message);
$this->httpExit($content);
}
/**
* Display the response using JSON to encode the content
*
* @param mixed $content
* @param string $content_type
* @param int $options A combination of json_encode() binary flags
* @return void
* @throws HTTPException\InternalServerErrorException
* @see json_encode()
*/
public function jsonExit($content, string $content_type = 'application/json', int $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)
{
$this->httpExit(json_encode($content, $options), ICanCreateResponses::TYPE_JSON, $content_type);
}
/**
* Display a non-200 HTTP code response using JSON to encode the content and exit
*
* @param int $httpCode
* @param mixed $content
* @param string $content_type
* @return void
* @throws HTTPException\InternalServerErrorException
*/
public function jsonError(int $httpCode, $content, string $content_type = 'application/json')
{
if ($httpCode >= 400) {
$this->logger->debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'callstack' => System::callstack(20), 'method' => $this->args->getMethod(), 'agent' => $this->server['HTTP_USER_AGENT'] ?? '']);
}
$this->response->setStatus($httpCode);
$this->jsonExit($content, $content_type);
}
} }

2
src/Capabilities/ICanCreateResponses.php
View File

@ -70,7 +70,7 @@ interface ICanCreateResponses
* *
* @throws InternalServerErrorException * @throws InternalServerErrorException
*/ */
public function setType(string $type, ?string $content_type = null): void; public function setType(string $type = ICanCreateResponses::TYPE_HTML, ?string $content_type = null): void;
/** /**
* Sets the status and the reason for the response * Sets the status and the reason for the response

80
src/Core/System.php
View File

@ -28,10 +28,12 @@ use Friendica\DI;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\Response; use Friendica\Module\Response;
use Friendica\Network\HTTPException\FoundException; use Friendica\Network\HTTPException\FoundException;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Network\HTTPException\MovedPermanentlyException; use Friendica\Network\HTTPException\MovedPermanentlyException;
use Friendica\Network\HTTPException\TemporaryRedirectException; use Friendica\Network\HTTPException\TemporaryRedirectException;
use Friendica\Util\BasePath; use Friendica\Util\BasePath;
use Friendica\Util\XML; use Friendica\Util\XML;
use Psr\Http\Message\ResponseInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
/** /**
@ -274,32 +276,59 @@ class System
return implode(', ', $callstack2); return implode(', ', $callstack2);
} }
/**
* Display current response, including setting all headers
*
* @param ResponseInterface $response
*/
public static function echoResponse(ResponseInterface $response)
{
header(sprintf("HTTP/%s %s %s",
$response->getProtocolVersion(),
$response->getStatusCode(),
$response->getReasonPhrase())
);
foreach ($response->getHeaders() as $key => $header) {
if (is_array($header)) {
$header_str = implode(',', $header);
} else {
$header_str = $header;
}
if (is_int($key)) {
header($header_str);
} else {
header("$key: $header_str");
}
}
echo $response->getBody();
}
/** /**
* Generic XML return * Generic XML return
* Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
* of $st and an optional text <message> of $message and terminates the current process. * of $st and an optional text <message> of $message and terminates the current process.
* *
* @param $st * @param mixed $status
* @param string $message * @param string $message
* @throws \Exception * @throws \Exception
* @deprecated since 2023.09 Use BaseModule->httpExit() instead
*/ */
public static function xmlExit($st, $message = '') public static function xmlExit($status, string $message = '')
{ {
$result = ['status' => $st]; $result = ['status' => $status];
if ($message != '') { if ($message != '') {
$result['message'] = $message; $result['message'] = $message;
} }
if ($st) { if ($status) {
Logger::notice('xml_status returning non_zero: ' . $st . " message=" . $message); Logger::notice('xml_status returning non_zero: ' . $status . " message=" . $message);
} }
DI::apiResponse()->setType(Response::TYPE_XML); self::httpExit(XML::fromArray(['result' => $result]), Response::TYPE_XML);
DI::apiResponse()->addContent(XML::fromArray(['result' => $result]));
DI::page()->exit(DI::apiResponse()->generate());
self::exit();
} }
/** /**
@ -309,6 +338,7 @@ class System
* @param string $message Error message. Optional. * @param string $message Error message. Optional.
* @param string $content Response body. Optional. * @param string $content Response body. Optional.
* @throws \Exception * @throws \Exception
* @deprecated since 2023.09 Use BaseModule->httpError instead
*/ */
public static function httpError($httpCode, $message = '', $content = '') public static function httpError($httpCode, $message = '', $content = '')
{ {
@ -316,29 +346,33 @@ class System
Logger::debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); Logger::debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
} }
DI::apiResponse()->setStatus($httpCode, $message); DI::apiResponse()->setStatus($httpCode, $message);
DI::apiResponse()->addContent($content);
DI::page()->exit(DI::apiResponse()->generate());
self::exit(); self::httpExit($content);
} }
/** /**
* This function adds the content and a content-type HTTP header to the output. * This function adds the content and a content-type HTTP header to the output.
* After finishing the process is getting killed. * After finishing the process is getting killed.
* *
* @param string $content * @param string $content
* @param string $type * @param string $type
* @param string|null $content_type * @param string|null $content_type
* @return void * @return void
* @throws InternalServerErrorException
* @deprecated since 2023.09 Use BaseModule->httpExit() instead
*/ */
public static function httpExit(string $content, string $type = Response::TYPE_HTML, ?string $content_type = null) { public static function httpExit(string $content, string $type = Response::TYPE_HTML, ?string $content_type = null)
{
DI::apiResponse()->setType($type, $content_type); DI::apiResponse()->setType($type, $content_type);
DI::apiResponse()->addContent($content); DI::apiResponse()->addContent($content);
DI::page()->exit(DI::apiResponse()->generate()); self::echoResponse(DI::apiResponse()->generate());
self::exit(); self::exit();
} }
/**
* @deprecated since 2023.09 Use BaseModule->jsonError instead
*/
public static function jsonError($httpCode, $content, $content_type = 'application/json') public static function jsonError($httpCode, $content, $content_type = 'application/json')
{ {
if ($httpCode >= 400) { if ($httpCode >= 400) {
@ -358,14 +392,12 @@ class System
* @param mixed $content The input content * @param mixed $content The input content
* @param string $content_type Type of the input (Default: 'application/json') * @param string $content_type Type of the input (Default: 'application/json')
* @param integer $options JSON options * @param integer $options JSON options
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws InternalServerErrorException
* @deprecated since 2023.09 Use BaseModule->jsonExit instead
*/ */
public static function jsonExit($content, $content_type = 'application/json', int $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT) { public static function jsonExit($content, string $content_type = 'application/json', int $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)
DI::apiResponse()->setType(Response::TYPE_JSON, $content_type); {
DI::apiResponse()->addContent(json_encode($content, $options)); self::httpExit(json_encode($content, $options), Response::TYPE_JSON, $content_type);
DI::page()->exit(DI::apiResponse()->generate());
self::exit();
} }
/** /**

10
src/Factory/Api/Mastodon/Error.php
View File

@ -57,7 +57,7 @@ class Error extends BaseFactory
$errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description); $errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
$this->logError(404, $error); $this->logError(404, $error);
System::jsonError(404, $errorObj->toArray()); $this->jsonError(404, $errorObj->toArray());
} }
public function UnprocessableEntity(string $error = '') public function UnprocessableEntity(string $error = '')
@ -67,7 +67,7 @@ class Error extends BaseFactory
$errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description); $errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
$this->logError(422, $error); $this->logError(422, $error);
System::jsonError(422, $errorObj->toArray()); $this->jsonError(422, $errorObj->toArray());
} }
public function Unauthorized(string $error = '', string $error_description = '') public function Unauthorized(string $error = '', string $error_description = '')
@ -76,7 +76,7 @@ class Error extends BaseFactory
$errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description); $errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
$this->logError(401, $error); $this->logError(401, $error);
System::jsonError(401, $errorObj->toArray()); $this->jsonError(401, $errorObj->toArray());
} }
public function Forbidden(string $error = '') public function Forbidden(string $error = '')
@ -86,7 +86,7 @@ class Error extends BaseFactory
$errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description); $errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
$this->logError(403, $error); $this->logError(403, $error);
System::jsonError(403, $errorObj->toArray()); $this->jsonError(403, $errorObj->toArray());
} }
public function InternalError(string $error = '') public function InternalError(string $error = '')
@ -96,6 +96,6 @@ class Error extends BaseFactory
$errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description); $errorObj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
$this->logError(500, $error); $this->logError(500, $error);
System::jsonError(500, $errorObj->toArray()); $this->jsonError(500, $errorObj->toArray());
} }
} }

2
src/Module/AccountManagementControlDocument.php
View File

@ -79,6 +79,6 @@ class AccountManagementControlDocument extends BaseModule
], ],
]; ];
System::jsonExit($output); $this->jsonExit($output);
} }
} }

2
src/Module/ActivityPub/Featured.php
View File

@ -46,6 +46,6 @@ class Featured extends BaseModule
$featured = ActivityPub\Transmitter::getFeatured($owner, $page); $featured = ActivityPub\Transmitter::getFeatured($owner, $page);
System::jsonExit($featured, 'application/activity+json'); $this->jsonExit($featured, 'application/activity+json');
} }
} }

2
src/Module/ActivityPub/Followers.php
View File

@ -49,6 +49,6 @@ class Followers extends BaseModule
$followers = ActivityPub\Transmitter::getContacts($owner, [Contact::FOLLOWER, Contact::FRIEND], 'followers', $page, (string)HTTPSignature::getSigner('', $_SERVER)); $followers = ActivityPub\Transmitter::getContacts($owner, [Contact::FOLLOWER, Contact::FRIEND], 'followers', $page, (string)HTTPSignature::getSigner('', $_SERVER));
System::jsonExit($followers, 'application/activity+json'); $this->jsonExit($followers, 'application/activity+json');
} }
} }

2
src/Module/ActivityPub/Following.php
View File

@ -47,6 +47,6 @@ class Following extends BaseModule
$following = ActivityPub\Transmitter::getContacts($owner, [Contact::SHARING, Contact::FRIEND], 'following', $page); $following = ActivityPub\Transmitter::getContacts($owner, [Contact::SHARING, Contact::FRIEND], 'following', $page);
System::jsonExit($following, 'application/activity+json'); $this->jsonExit($following, 'application/activity+json');
} }
} }

2
src/Module/ActivityPub/Inbox.php
View File

@ -66,7 +66,7 @@ class Inbox extends BaseApi
$inbox = ActivityPub\ClientToServer::getPublicInbox($uid, $page, $request['max_id'] ?? null); $inbox = ActivityPub\ClientToServer::getPublicInbox($uid, $page, $request['max_id'] ?? null);
} }
System::jsonExit($inbox, 'application/activity+json'); $this->jsonExit($inbox, 'application/activity+json');
} }
protected function post(array $request = []) protected function post(array $request = [])

2
src/Module/ActivityPub/Objects.php
View File

@ -130,6 +130,6 @@ class Objects extends BaseModule
// Relaxed CORS header for public items // Relaxed CORS header for public items
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
System::jsonExit($data, 'application/activity+json'); $this->jsonExit($data, 'application/activity+json');
} }
} }

4
src/Module/ActivityPub/Outbox.php
View File

@ -53,7 +53,7 @@ class Outbox extends BaseApi
$outbox = ActivityPub\ClientToServer::getOutbox($owner, $uid, $page, $request['max_id'] ?? null, HTTPSignature::getSigner('', $_SERVER)); $outbox = ActivityPub\ClientToServer::getOutbox($owner, $uid, $page, $request['max_id'] ?? null, HTTPSignature::getSigner('', $_SERVER));
System::jsonExit($outbox, 'application/activity+json'); $this->jsonExit($outbox, 'application/activity+json');
} }
protected function post(array $request = []) protected function post(array $request = [])
@ -79,6 +79,6 @@ class Outbox extends BaseApi
throw new \Friendica\Network\HTTPException\BadRequestException(); throw new \Friendica\Network\HTTPException\BadRequestException();
} }
System::jsonExit(ActivityPub\ClientToServer::processActivity($activity, $uid, self::getCurrentApplication() ?? [])); $this->jsonExit(ActivityPub\ClientToServer::processActivity($activity, $uid, self::getCurrentApplication() ?? []));
} }
} }

2
src/Module/ActivityPub/Whoami.php
View File

@ -100,6 +100,6 @@ class Whoami extends BaseApi
]; ];
$data['generator'] = ActivityPub\Transmitter::getService(); $data['generator'] = ActivityPub\Transmitter::getService();
System::jsonExit($data, 'application/activity+json'); $this->jsonExit($data, 'application/activity+json');
} }
} }

38
src/Module/Api/ApiResponse.php
View File

@ -25,6 +25,7 @@ use Friendica\App\Arguments;
use Friendica\App\BaseURL; use Friendica\App\BaseURL;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Module\Response; use Friendica\Module\Response;
use Friendica\Network\HTTPException;
use Friendica\Util\Arrays; use Friendica\Util\Arrays;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -46,14 +47,20 @@ class ApiResponse extends Response
protected $baseUrl; protected $baseUrl;
/** @var TwitterUser */ /** @var TwitterUser */
protected $twitterUser; protected $twitterUser;
/** @var array */
protected $server;
/** @var string */
protected $jsonpCallback;
public function __construct(L10n $l10n, Arguments $args, LoggerInterface $logger, BaseURL $baseUrl, TwitterUser $twitterUser) public function __construct(L10n $l10n, Arguments $args, LoggerInterface $logger, BaseURL $baseUrl, TwitterUser $twitterUser, array $server = [], string $jsonpCallback = '')
{ {
$this->l10n = $l10n; $this->l10n = $l10n;
$this->args = $args; $this->args = $args;
$this->logger = $logger; $this->logger = $logger;
$this->baseUrl = $baseUrl; $this->baseUrl = $baseUrl;
$this->twitterUser = $twitterUser; $this->twitterUser = $twitterUser;
$this->server = $server;
$this->jsonpCallback = $jsonpCallback;
} }
/** /**
@ -63,6 +70,7 @@ class ApiResponse extends Response
* @param string $root_element Name of the root element * @param string $root_element Name of the root element
* *
* @return string The XML data * @return string The XML data
* @throws \Exception
*/ */
public function createXML(array $data, string $root_element): string public function createXML(array $data, string $root_element): string
{ {
@ -109,6 +117,7 @@ class ApiResponse extends Response
* @param int $cid Contact ID of template * @param int $cid Contact ID of template
* *
* @return array * @return array
* @throws HTTPException\InternalServerErrorException
*/ */
private function addRSSValues(array $arr, int $cid): array private function addRSSValues(array $arr, int $cid): array
{ {
@ -141,6 +150,7 @@ class ApiResponse extends Response
* @param int $cid ID of the contact for RSS * @param int $cid ID of the contact for RSS
* *
* @return array|string (string|array) XML data or JSON data * @return array|string (string|array) XML data or JSON data
* @throws HTTPException\InternalServerErrorException
*/ */
public function formatData(string $root_element, string $type, array $data, int $cid = 0) public function formatData(string $root_element, string $type, array $data, int $cid = 0)
{ {
@ -180,7 +190,7 @@ class ApiResponse extends Response
} }
/** /**
* Exit with error code * Add formatted error message to response
* *
* @param int $code * @param int $code
* @param string $description * @param string $description
@ -188,6 +198,7 @@ class ApiResponse extends Response
* @param string|null $format * @param string|null $format
* *
* @return void * @return void
* @throws HTTPException\InternalServerErrorException
*/ */
public function error(int $code, string $description, string $message, string $format = null) public function error(int $code, string $description, string $message, string $format = null)
{ {
@ -197,21 +208,23 @@ class ApiResponse extends Response
'request' => $this->args->getQueryString() 'request' => $this->args->getQueryString()
]; ];
$this->setHeader(($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1') . ' ' . $code . ' ' . $description); $this->setHeader(($this->server['SERVER_PROTOCOL'] ?? 'HTTP/1.1') . ' ' . $code . ' ' . $description);
$this->exit('status', ['status' => $error], $format); $this->addFormattedContent('status', ['status' => $error], $format);
} }
/** /**
* Outputs formatted data according to the data type and then exits the execution. * Add formatted data according to the data type to the response.
* *
* @param string $root_element * @param string $root_element
* @param array $data An array with a single element containing the returned result * @param array $data An array with a single element containing the returned result
* @param string|null $format Output format (xml, json, rss, atom) * @param string|null $format Output format (xml, json, rss, atom)
* @param int $cid
* *
* @return void * @return void
* @throws HTTPException\InternalServerErrorException
*/ */
public function exit(string $root_element, array $data, string $format = null, int $cid = 0) public function addFormattedContent(string $root_element, array $data, string $format = null, int $cid = 0)
{ {
$format = $format ?? 'json'; $format = $format ?? 'json';
@ -226,8 +239,8 @@ class ApiResponse extends Response
$this->setType(static::TYPE_JSON); $this->setType(static::TYPE_JSON);
if (!empty($return)) { if (!empty($return)) {
$json = json_encode(end($return)); $json = json_encode(end($return));
if (!empty($_GET['callback'])) { if ($this->jsonpCallback) {
$json = $_GET['callback'] . '(' . $json . ')'; $json = $this->jsonpCallback . '(' . $json . ')';
} }
$return = $json; $return = $json;
} }
@ -246,15 +259,16 @@ class ApiResponse extends Response
} }
/** /**
* Wrapper around exit() for JSON only responses * Wrapper around addFormattedContent() for JSON only responses
* *
* @param array $data * @param array $data
* *
* @return void * @return void
* @throws HTTPException\InternalServerErrorException
*/ */
public function exitWithJson(array $data) public function addJsonContent(array $data)
{ {
$this->exit('content', ['content' => $data], static::TYPE_JSON); $this->addFormattedContent('content', ['content' => $data], static::TYPE_JSON);
} }
/** /**
@ -273,7 +287,7 @@ class ApiResponse extends Response
[ [
'method' => $method, 'method' => $method,
'path' => $path, 'path' => $path,
'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'agent' => $this->server['HTTP_USER_AGENT'] ?? '',
'request' => $request, 'request' => $request,
]); ]);
$error = $this->l10n->t('API endpoint %s %s is not implemented but might be in the future.', strtoupper($method), $path); $error = $this->l10n->t('API endpoint %s %s is not implemented but might be in the future.', strtoupper($method), $path);

2
src/Module/Api/Friendica/Activity.php
View File

@ -60,7 +60,7 @@ class Activity extends BaseApi
if ($res) { if ($res) {
$status_info = DI::twitterStatus()->createFromUriId($request['id'], $uid)->toArray(); $status_info = DI::twitterStatus()->createFromUriId($request['id'], $uid)->toArray();
$this->response->exit('status', ['status' => $status_info], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('status', ['status' => $status_info], $this->parameters['extension'] ?? null);
} else { } else {
$this->response->error(500, 'Error adding activity', '', $this->parameters['extension'] ?? null); $this->response->error(500, 'Error adding activity', '', $this->parameters['extension'] ?? null);
} }

2
src/Module/Api/Friendica/Circle/Create.php
View File

@ -82,6 +82,6 @@ class Create extends BaseApi
$result = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers]; $result = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers];
$this->response->exit('group_create', ['$result' => $result], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('group_create', ['$result' => $result], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/Friendica/Circle/Delete.php
View File

@ -70,7 +70,7 @@ class Delete extends BaseApi
if ($ret) { if ($ret) {
// return success // return success
$success = ['success' => $ret, 'gid' => $request['gid'], 'name' => $request['name'], 'status' => 'deleted', 'wrong users' => []]; $success = ['success' => $ret, 'gid' => $request['gid'], 'name' => $request['name'], 'status' => 'deleted', 'wrong users' => []];
$this->response->exit('group_delete', ['$result' => $success], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('group_delete', ['$result' => $success], $this->parameters['extension'] ?? null);
} else { } else {
throw new BadRequestException('other API error'); throw new BadRequestException('other API error');
} }

2
src/Module/Api/Friendica/Circle/Show.php
View File

@ -75,6 +75,6 @@ class Show extends BaseApi
$grps[] = ['name' => $circle['name'], 'gid' => $circle['id'], $user_element => $users]; $grps[] = ['name' => $circle['name'], 'gid' => $circle['id'], $user_element => $users];
} }
$this->response->exit('group_update', ['group' => $grps], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('group_update', ['group' => $grps], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/Friendica/Circle/Update.php
View File

@ -84,6 +84,6 @@ class Update extends BaseApi
// return success message incl. missing users in array // return success message incl. missing users in array
$status = ($erroraddinguser ? 'missing user' : 'ok'); $status = ($erroraddinguser ? 'missing user' : 'ok');
$success = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers]; $success = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers];
$this->response->exit('group_update', ['$result' => $success], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('group_update', ['$result' => $success], $this->parameters['extension'] ?? null);
} }
} }

4
src/Module/Api/Friendica/DirectMessages/Search.php
View File

@ -64,7 +64,7 @@ class Search extends BaseApi
// error if no searchstring specified // error if no searchstring specified
if ($request['searchstring'] == '') { if ($request['searchstring'] == '') {
$answer = ['result' => 'error', 'message' => 'searchstring not specified']; $answer = ['result' => 'error', 'message' => 'searchstring not specified'];
$this->response->exit('direct_message_search', ['$result' => $answer], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('direct_message_search', ['$result' => $answer], $this->parameters['extension'] ?? null);
return; return;
} }
@ -82,6 +82,6 @@ class Search extends BaseApi
$success = ['success' => true, 'search_results' => $ret]; $success = ['success' => true, 'search_results' => $ret];
} }
$this->response->exit('direct_message_search', ['$result' => $success], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('direct_message_search', ['$result' => $success], $this->parameters['extension'] ?? null);
} }
} }

6
src/Module/Api/Friendica/DirectMessages/Setseen.php
View File

@ -42,14 +42,14 @@ class Setseen extends BaseApi
// return error if id is zero // return error if id is zero
if (empty($request['id'])) { if (empty($request['id'])) {
$answer = ['result' => 'error', 'message' => 'message id not specified']; $answer = ['result' => 'error', 'message' => 'message id not specified'];
$this->response->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
return; return;
} }
// error message if specified id is not in database // error message if specified id is not in database
if (!DBA::exists('mail', ['id' => $request['id'], 'uid' => $uid])) { if (!DBA::exists('mail', ['id' => $request['id'], 'uid' => $uid])) {
$answer = ['result' => 'error', 'message' => 'message id not in database']; $answer = ['result' => 'error', 'message' => 'message id not in database'];
$this->response->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
return; return;
} }
@ -60,6 +60,6 @@ class Setseen extends BaseApi
$answer = ['result' => 'error', 'message' => 'unknown error']; $answer = ['result' => 'error', 'message' => 'unknown error'];
} }
$this->response->exit('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('direct_messages_setseen', ['$result' => $answer], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/Friendica/Events/Create.php
View File

@ -110,6 +110,6 @@ class Create extends BaseApi
$result = ['success' => true, 'event_id' => $event_id, 'event' => $event]; $result = ['success' => true, 'event_id' => $event_id, 'event' => $event];
$this->response->exit('event_create', ['$result' => $result], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('event_create', ['$result' => $result], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/Friendica/Events/Delete.php
View File

@ -59,6 +59,6 @@ class Delete extends BaseApi
Event::delete($eventid); Event::delete($eventid);
$success = ['id' => $eventid, 'status' => 'deleted']; $success = ['id' => $eventid, 'status' => 'deleted'];
$this->response->exit('event_delete', ['$result' => $success], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('event_delete', ['$result' => $success], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/Friendica/Events/Index.php
View File

@ -69,6 +69,6 @@ class Index extends BaseApi
]; ];
} }
$this->response->exit('events', ['events' => $items], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('events', ['events' => $items], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/Friendica/Notification.php
View File

@ -56,6 +56,6 @@ class Notification extends BaseApi
$result = false; $result = false;
} }
$this->response->exit('notes', ['note' => $result], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('notes', ['note' => $result], $this->parameters['extension'] ?? null);
} }
} }

4
src/Module/Api/Friendica/Notification/Seen.php
View File

@ -70,13 +70,13 @@ class Seen extends BaseApi
// we found the item, return it to the user // we found the item, return it to the user
$ret = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()]; $ret = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()];
$data = ['status' => $ret]; $data = ['status' => $ret];
$this->response->exit('statuses', $data, $this->parameters['extension'] ?? null); $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null);
return; return;
} }
// the item can't be found, but we set the notification as seen, so we count this as a success // the item can't be found, but we set the notification as seen, so we count this as a success
} }
$this->response->exit('statuses', ['result' => 'success'], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('statuses', ['result' => 'success'], $this->parameters['extension'] ?? null);
} catch (NotFoundException $e) { } catch (NotFoundException $e) {
throw new BadRequestException('Invalid argument', $e); throw new BadRequestException('Invalid argument', $e);
} catch (Exception $e) { } catch (Exception $e) {

2
src/Module/Api/Friendica/Photo.php
View File

@ -60,6 +60,6 @@ class Photo extends BaseApi
// prepare json/xml output with data from database for the requested photo // prepare json/xml output with data from database for the requested photo
$data = ['photo' => $this->friendicaPhoto->createFromId($photo_id, $scale, $uid, $type)]; $data = ['photo' => $this->friendicaPhoto->createFromId($photo_id, $scale, $uid, $type)];
$this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
} }
} }

2
src/Module/Api/Friendica/Photo/Create.php
View File

@ -90,7 +90,7 @@ class Create extends BaseApi
if (!empty($photo)) { if (!empty($photo)) {
Photo::clearAlbumCache($uid); Photo::clearAlbumCache($uid);
$data = ['photo' => $this->friendicaPhoto->createFromId($photo['resource_id'], null, $uid, $type)]; $data = ['photo' => $this->friendicaPhoto->createFromId($photo['resource_id'], null, $uid, $type)];
$this->response->exit('photo_create', $data, $this->parameters['extension'] ?? null); $this->response->addFormattedContent('photo_create', $data, $this->parameters['extension'] ?? null);
} else { } else {
throw new HTTPException\InternalServerErrorException('unknown error - uploading photo failed, see Friendica log for more information'); throw new HTTPException\InternalServerErrorException('unknown error - uploading photo failed, see Friendica log for more information');
} }

2
src/Module/Api/Friendica/Photo/Delete.php
View File

@ -62,7 +62,7 @@ class Delete extends BaseApi
Item::deleteForUser($condition, $uid); Item::deleteForUser($condition, $uid);
Photo::clearAlbumCache($uid); Photo::clearAlbumCache($uid);
$result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.']; $result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.'];
$this->response->exit('photo_delete', ['$result' => $result], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('photo_delete', ['$result' => $result], $this->parameters['extension'] ?? null);
} else { } else {
throw new InternalServerErrorException("unknown error on deleting photo from database table"); throw new InternalServerErrorException("unknown error on deleting photo from database table");
} }

2
src/Module/Api/Friendica/Photo/Lists.php
View File

@ -77,6 +77,6 @@ class Lists extends BaseApi
} }
} }
$this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
} }
} }

6
src/Module/Api/Friendica/Photo/Update.php
View File

@ -128,7 +128,7 @@ class Update extends BaseApi
$photo = Photo::upload($uid, $_FILES['media'], $album, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc, $photo_id); $photo = Photo::upload($uid, $_FILES['media'], $album, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc, $photo_id);
if (!empty($photo)) { if (!empty($photo)) {
$data = ['photo' => $this->friendicaPhoto->createFromId($photo['resource_id'], null, $uid, $type)]; $data = ['photo' => $this->friendicaPhoto->createFromId($photo['resource_id'], null, $uid, $type)];
$this->response->exit('photo_update', $data, $this->parameters['extension'] ?? null); $this->response->addFormattedContent('photo_update', $data, $this->parameters['extension'] ?? null);
return; return;
} }
} }
@ -137,12 +137,12 @@ class Update extends BaseApi
if ($result) { if ($result) {
Photo::clearAlbumCache($uid); Photo::clearAlbumCache($uid);
$answer = ['result' => 'updated', 'message' => 'Image id `' . $photo_id . '` has been updated.']; $answer = ['result' => 'updated', 'message' => 'Image id `' . $photo_id . '` has been updated.'];
$this->response->exit('photo_update', ['$result' => $answer], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('photo_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
return; return;
} else { } else {
if ($nothingtodo) { if ($nothingtodo) {
$answer = ['result' => 'cancelled', 'message' => 'Nothing to update for image id `' . $photo_id . '`.']; $answer = ['result' => 'cancelled', 'message' => 'Nothing to update for image id `' . $photo_id . '`.'];
$this->response->exit('photo_update', ['$result' => $answer], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('photo_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
return; return;
} }
throw new HTTPException\InternalServerErrorException('unknown error - update photo entry in database failed'); throw new HTTPException\InternalServerErrorException('unknown error - update photo entry in database failed');

2
src/Module/Api/Friendica/Photoalbum/Delete.php
View File

@ -68,7 +68,7 @@ class Delete extends BaseApi
if ($result) { if ($result) {
Photo::clearAlbumCache($uid); Photo::clearAlbumCache($uid);
$answer = ['result' => 'deleted', 'message' => 'album `' . $request['album'] . '` with all containing photos has been deleted.']; $answer = ['result' => 'deleted', 'message' => 'album `' . $request['album'] . '` with all containing photos has been deleted.'];
$this->response->exit('photoalbum_delete', ['$result' => $answer], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('photoalbum_delete', ['$result' => $answer], $this->parameters['extension'] ?? null);
} else { } else {
throw new InternalServerErrorException("unknown error - deleting from database failed"); throw new InternalServerErrorException("unknown error - deleting from database failed");
} }

2
src/Module/Api/Friendica/Photoalbum/Index.php
View File

@ -47,6 +47,6 @@ class Index extends BaseApi
]; ];
} }
$this->response->exit('albums', ['albums' => $items], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('albums', ['albums' => $items], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/Friendica/Photoalbum/Show.php
View File

@ -104,6 +104,6 @@ class Show extends BaseApi
} }
} }
$this->response->exit('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); $this->response->addFormattedContent('statuses', $data, $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
} }
} }

2
src/Module/Api/Friendica/Photoalbum/Update.php
View File

@ -60,7 +60,7 @@ class Update extends BaseApi
if ($result) { if ($result) {
Photo::clearAlbumCache($uid); Photo::clearAlbumCache($uid);
$answer = ['result' => 'updated', 'message' => 'album `' . $request['album'] . '` with all containing photos has been renamed to `' . $request['album_new'] . '`.']; $answer = ['result' => 'updated', 'message' => 'album `' . $request['album'] . '` with all containing photos has been renamed to `' . $request['album_new'] . '`.'];
$this->response->exit('photoalbum_update', ['$result' => $answer], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('photoalbum_update', ['$result' => $answer], $this->parameters['extension'] ?? null);
} else { } else {
throw new InternalServerErrorException("unknown error - updating in database failed"); throw new InternalServerErrorException("unknown error - updating in database failed");
} }

2
src/Module/Api/Friendica/Profile/Show.php
View File

@ -62,7 +62,7 @@ class Show extends BaseApi
'profiles' => $profiles 'profiles' => $profiles
]; ];
$this->response->exit('friendica_profiles', ['$result' => $result], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('friendica_profiles', ['$result' => $result], $this->parameters['extension'] ?? null);
} }
/** /**

2
src/Module/Api/Friendica/Statuses/Dislike.php
View File

@ -49,6 +49,6 @@ class Dislike extends BaseApi
Item::performActivity($item['id'], 'dislike', $uid); Item::performActivity($item['id'], 'dislike', $uid);
System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); $this->jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray());
} }
} }

2
src/Module/Api/Friendica/Statuses/DislikedBy.php
View File

@ -57,6 +57,6 @@ class DislikedBy extends BaseApi
$accounts[] = DI::mstdnAccount()->createFromContactId($activity['author-id'], $uid); $accounts[] = DI::mstdnAccount()->createFromContactId($activity['author-id'], $uid);
} }
System::jsonExit($accounts); $this->jsonExit($accounts);
} }
} }

2
src/Module/Api/Friendica/Statuses/Undislike.php
View File

@ -49,6 +49,6 @@ class Undislike extends BaseApi
Item::performActivity($item['id'], 'undislike', $uid); Item::performActivity($item['id'], 'undislike', $uid);
System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); $this->jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray());
} }
} }

2
src/Module/Api/GNUSocial/GNUSocial/Config.php
View File

@ -61,6 +61,6 @@ class Config extends BaseApi
], ],
]; ];
$this->response->exit('config', ['config' => $config], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('config', ['config' => $config], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/GNUSocial/GNUSocial/Version.php
View File

@ -31,6 +31,6 @@ class Version extends BaseApi
{ {
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
$this->response->exit('version', ['version' => '0.9.7'], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('version', ['version' => '0.9.7'], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/GNUSocial/Help/Test.php
View File

@ -37,6 +37,6 @@ class Test extends BaseApi
$ok = 'ok'; $ok = 'ok';
} }
$this->response->exit('ok', ['ok' => $ok], $this->parameters['extension'] ?? null); $this->response->addFormattedContent('ok', ['ok' => $ok], $this->parameters['extension'] ?? null);
} }
} }

2
src/Module/Api/GNUSocial/Statusnet/Conversation.php
View File

@ -90,6 +90,6 @@ class Conversation extends BaseApi
} }
DBA::close($statuses); DBA::close($statuses);
$this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); $this->response->addFormattedContent('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
} }
} }

2
src/Module/Api/Mastodon/Accounts.php
View File

@ -58,6 +58,6 @@ class Accounts extends BaseApi
} }
$account = DI::mstdnAccount()->createFromContactId($id, $uid); $account = DI::mstdnAccount()->createFromContactId($id, $uid);
System::jsonExit($account); $this->jsonExit($account);
} }
} }

2
src/Module/Api/Mastodon/Accounts/Block.php
View File

@ -52,6 +52,6 @@ class Block extends BaseApi
} }
} }
System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray()); $this->jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
} }
} }

2
src/Module/Api/Mastodon/Accounts/FeaturedTags.php
View File

@ -36,6 +36,6 @@ class FeaturedTags extends BaseApi
{ {
self::checkAllowedScope(self::SCOPE_READ); self::checkAllowedScope(self::SCOPE_READ);
System::jsonExit([]); $this->jsonExit([]);
} }
} }

2
src/Module/Api/Mastodon/Accounts/Follow.php
View File

@ -54,6 +54,6 @@ class Follow extends BaseApi
Contact::update(['notify_new_posts' => $request['notify']], ['id' => $result['cid']]); Contact::update(['notify_new_posts' => $request['notify']], ['id' => $result['cid']]);
System::jsonExit(DI::mstdnRelationship()->createFromContactId($result['cid'], $uid)->toArray()); $this->jsonExit(DI::mstdnRelationship()->createFromContactId($result['cid'], $uid)->toArray());
} }
} }

2
src/Module/Api/Mastodon/Accounts/Followers.php
View File

@ -115,6 +115,6 @@ class Followers extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($accounts); $this->jsonExit($accounts);
} }
} }

2
src/Module/Api/Mastodon/Accounts/Following.php
View File

@ -115,6 +115,6 @@ class Following extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($accounts); $this->jsonExit($accounts);
} }
} }

2
src/Module/Api/Mastodon/Accounts/IdentityProofs.php
View File

@ -36,6 +36,6 @@ class IdentityProofs extends BaseApi
{ {
self::checkAllowedScope(self::SCOPE_READ); self::checkAllowedScope(self::SCOPE_READ);
System::jsonExit([]); $this->jsonExit([]);
} }
} }

2
src/Module/Api/Mastodon/Accounts/Lists.php
View File

@ -60,6 +60,6 @@ class Lists extends BaseApi
DBA::close($circles); DBA::close($circles);
} }
System::jsonExit($lists); $this->jsonExit($lists);
} }
} }

2
src/Module/Api/Mastodon/Accounts/Mute.php
View File

@ -42,6 +42,6 @@ class Mute extends BaseApi
Contact\User::setIgnored($this->parameters['id'], $uid, true); Contact\User::setIgnored($this->parameters['id'], $uid, true);
System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray()); $this->jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
} }
} }

2
src/Module/Api/Mastodon/Accounts/Note.php
View File

@ -52,6 +52,6 @@ class Note extends BaseApi
Contact::update(['info' => $request['comment']], ['id' => $cdata['user']]); Contact::update(['info' => $request['comment']], ['id' => $cdata['user']]);
System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray()); $this->jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
} }
} }

2
src/Module/Api/Mastodon/Accounts/Relationships.php
View File

@ -57,6 +57,6 @@ class Relationships extends BaseApi
$relationships[] = DI::mstdnRelationship()->createFromContactId($id, $uid); $relationships[] = DI::mstdnRelationship()->createFromContactId($id, $uid);
} }
System::jsonExit($relationships); $this->jsonExit($relationships);
} }
} }

2
src/Module/Api/Mastodon/Accounts/Search.php
View File

@ -67,6 +67,6 @@ class Search extends BaseApi
DBA::close($contacts); DBA::close($contacts);
} }
System::jsonExit($accounts); $this->jsonExit($accounts);
} }
} }

2
src/Module/Api/Mastodon/Accounts/Statuses.php
View File

@ -122,6 +122,6 @@ class Statuses extends BaseApi
} }
self::setLinkHeader($request['friendica_order'] != TimelineOrderByTypes::ID); self::setLinkHeader($request['friendica_order'] != TimelineOrderByTypes::ID);
System::jsonExit($statuses); $this->jsonExit($statuses);
} }
} }

2
src/Module/Api/Mastodon/Accounts/Unblock.php
View File

@ -42,6 +42,6 @@ class Unblock extends BaseApi
Contact\User::setBlocked($this->parameters['id'], $uid, false); Contact\User::setBlocked($this->parameters['id'], $uid, false);
System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray()); $this->jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
} }
} }

2
src/Module/Api/Mastodon/Accounts/Unfollow.php
View File

@ -49,6 +49,6 @@ class Unfollow extends BaseApi
Contact::unfollow($contact); Contact::unfollow($contact);
System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray()); $this->jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
} }
} }

2
src/Module/Api/Mastodon/Accounts/Unmute.php
View File

@ -42,6 +42,6 @@ class Unmute extends BaseApi
Contact\User::setIgnored($this->parameters['id'], $uid, false); Contact\User::setIgnored($this->parameters['id'], $uid, false);
System::jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray()); $this->jsonExit(DI::mstdnRelationship()->createFromContactId($this->parameters['id'], $uid)->toArray());
} }
} }

2
src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
View File

@ -105,6 +105,6 @@ class UpdateCredentials extends BaseApi
} }
$account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid); $account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid);
$this->response->exitWithJson($account->toArray()); $this->response->addJsonContent($account->toArray());
} }
} }

2
src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
View File

@ -52,6 +52,6 @@ class VerifyCredentials extends BaseApi
// @todo Support the source property, // @todo Support the source property,
$account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid); $account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid);
$this->response->exitWithJson($account->toArray()); $this->response->addJsonContent($account->toArray());
} }
} }

2
src/Module/Api/Mastodon/Announcements.php
View File

@ -37,6 +37,6 @@ class Announcements extends BaseApi
self::checkAllowedScope(self::SCOPE_READ); self::checkAllowedScope(self::SCOPE_READ);
// @todo Possibly use the message from the pageheader addon for this // @todo Possibly use the message from the pageheader addon for this
System::jsonExit([]); $this->jsonExit([]);
} }
} }

4
src/Module/Api/Mastodon/Apps.php
View File

@ -66,7 +66,7 @@ class Apps extends BaseApi
if (!empty($request['redirect_uris']) && is_array($request['redirect_uris'])) { if (!empty($request['redirect_uris']) && is_array($request['redirect_uris'])) {
$request['redirect_uris'] = $request['redirect_uris'][0]; $request['redirect_uris'] = $request['redirect_uris'][0];
} }
} }
if (empty($request['client_name']) || empty($request['redirect_uris'])) { if (empty($request['client_name']) || empty($request['redirect_uris'])) {
@ -95,6 +95,6 @@ class Apps extends BaseApi
DI::mstdnError()->InternalError(); DI::mstdnError()->InternalError();
} }
System::jsonExit(DI::mstdnApplication()->createFromApplicationId(DBA::lastInsertId())->toArray()); $this->jsonExit(DI::mstdnApplication()->createFromApplicationId(DBA::lastInsertId())->toArray());
} }
} }

2
src/Module/Api/Mastodon/Apps/VerifyCredentials.php
View File

@ -39,6 +39,6 @@ class VerifyCredentials extends BaseApi
DI::mstdnError()->Unauthorized(); DI::mstdnError()->Unauthorized();
} }
System::jsonExit(DI::mstdnApplication()->createFromApplicationId($application['id'])); $this->jsonExit(DI::mstdnApplication()->createFromApplicationId($application['id']));
} }
} }

2
src/Module/Api/Mastodon/Blocks.php
View File

@ -77,6 +77,6 @@ class Blocks extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($accounts); $this->jsonExit($accounts);
} }
} }

2
src/Module/Api/Mastodon/Bookmarks.php
View File

@ -88,6 +88,6 @@ class Bookmarks extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($statuses); $this->jsonExit($statuses);
} }
} }

4
src/Module/Api/Mastodon/Conversations.php
View File

@ -43,7 +43,7 @@ class Conversations extends BaseApi
DBA::delete('conv', ['id' => $this->parameters['id'], 'uid' => $uid]); DBA::delete('conv', ['id' => $this->parameters['id'], 'uid' => $uid]);
DBA::delete('mail', ['convid' => $this->parameters['id'], 'uid' => $uid]); DBA::delete('mail', ['convid' => $this->parameters['id'], 'uid' => $uid]);
System::jsonExit([]); $this->jsonExit([]);
} }
/** /**
@ -95,6 +95,6 @@ class Conversations extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($conversations); $this->jsonExit($conversations);
} }
} }

2
src/Module/Api/Mastodon/Conversations/Read.php
View File

@ -42,6 +42,6 @@ class Read extends BaseApi
DBA::update('mail', ['seen' => true], ['convid' => $this->parameters['id'], 'uid' => $uid]); DBA::update('mail', ['seen' => true], ['convid' => $this->parameters['id'], 'uid' => $uid]);
System::jsonExit(DI::mstdnConversation()->createFromConvId($this->parameters['id'])->toArray()); $this->jsonExit(DI::mstdnConversation()->createFromConvId($this->parameters['id'])->toArray());
} }
} }

2
src/Module/Api/Mastodon/CustomEmojis.php
View File

@ -41,6 +41,6 @@ class CustomEmojis extends BaseApi
{ {
$emojis = DI::mstdnEmoji()->createCollectionFromSmilies(Smilies::getList()); $emojis = DI::mstdnEmoji()->createCollectionFromSmilies(Smilies::getList());
System::jsonExit($emojis->getArrayCopy()); $this->jsonExit($emojis->getArrayCopy());
} }
} }

2
src/Module/Api/Mastodon/Directory.php
View File

@ -68,6 +68,6 @@ class Directory extends BaseApi
} }
DBA::close($contacts); DBA::close($contacts);
System::jsonExit($accounts); $this->jsonExit($accounts);
} }
} }

2
src/Module/Api/Mastodon/Endorsements.php
View File

@ -34,6 +34,6 @@ class Endorsements extends BaseApi
*/ */
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
System::jsonExit([]); $this->jsonExit([]);
} }
} }

2
src/Module/Api/Mastodon/Favourited.php
View File

@ -90,6 +90,6 @@ class Favourited extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($statuses); $this->jsonExit($statuses);
} }
} }

2
src/Module/Api/Mastodon/Filters.php
View File

@ -45,6 +45,6 @@ class Filters extends BaseApi
{ {
self::checkAllowedScope(self::SCOPE_READ); self::checkAllowedScope(self::SCOPE_READ);
System::jsonExit([]); $this->jsonExit([]);
} }
} }

4
src/Module/Api/Mastodon/FollowRequests.php
View File

@ -79,7 +79,7 @@ class FollowRequests extends BaseApi
throw new HTTPException\BadRequestException('Unexpected action parameter, expecting "authorize", "ignore" or "reject"'); throw new HTTPException\BadRequestException('Unexpected action parameter, expecting "authorize", "ignore" or "reject"');
} }
System::jsonExit($relationship); $this->jsonExit($relationship);
} }
/** /**
@ -115,6 +115,6 @@ class FollowRequests extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($return); $this->jsonExit($return);
} }
} }

2
src/Module/Api/Mastodon/FollowedTags.php
View File

@ -77,6 +77,6 @@ class FollowedTags extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($return); $this->jsonExit($return);
} }
} }

2
src/Module/Api/Mastodon/Instance.php
View File

@ -59,6 +59,6 @@ class Instance extends BaseApi
*/ */
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
System::jsonExit(new InstanceEntity($this->config, $this->baseUrl, $this->database, System::getRules())); $this->jsonExit(new InstanceEntity($this->config, $this->baseUrl, $this->database, System::getRules()));
} }
} }

2
src/Module/Api/Mastodon/Instance/Peers.php
View File

@ -52,6 +52,6 @@ class Peers extends BaseApi
} }
DBA::close($instances); DBA::close($instances);
System::jsonExit($return); $this->jsonExit($return);
} }
} }

2
src/Module/Api/Mastodon/Instance/Rules.php
View File

@ -38,6 +38,6 @@ class Rules extends BaseApi
*/ */
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
System::jsonExit(System::getRules()); $this->jsonExit(System::getRules());
} }
} }

2
src/Module/Api/Mastodon/InstanceV2.php
View File

@ -94,7 +94,7 @@ class InstanceV2 extends BaseApi
$contact = $this->buildContactInfo(); $contact = $this->buildContactInfo();
$friendica_extensions = $this->buildFriendicaExtensionInfo(); $friendica_extensions = $this->buildFriendicaExtensionInfo();
$rules = System::getRules(); $rules = System::getRules();
System::jsonExit(new InstanceEntity( $this->jsonExit(new InstanceEntity(
$domain, $domain,
$title, $title,
$version, $version,

6
src/Module/Api/Mastodon/Lists.php
View File

@ -48,7 +48,7 @@ class Lists extends BaseApi
DI::mstdnError()->InternalError(); DI::mstdnError()->InternalError();
} }
System::jsonExit([]); $this->jsonExit([]);
} }
protected function post(array $request = []) protected function post(array $request = [])
@ -71,7 +71,7 @@ class Lists extends BaseApi
DI::mstdnError()->InternalError(); DI::mstdnError()->InternalError();
} }
System::jsonExit(DI::mstdnList()->createFromCircleId($id)); $this->jsonExit(DI::mstdnList()->createFromCircleId($id));
} }
public function put(array $request = []) public function put(array $request = [])
@ -111,6 +111,6 @@ class Lists extends BaseApi
$lists = DI::mstdnList()->createFromCircleId($id); $lists = DI::mstdnList()->createFromCircleId($id);
} }
System::jsonExit($lists); $this->jsonExit($lists);
} }
} }

2
src/Module/Api/Mastodon/Lists/Accounts.php
View File

@ -127,6 +127,6 @@ class Accounts extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($accounts); $this->jsonExit($accounts);
} }
} }

4
src/Module/Api/Mastodon/Markers.php
View File

@ -61,7 +61,7 @@ class Markers extends BaseApi
$fields = ['last_read_id' => $last_read_id, 'version' => $version, 'updated_at' => DateTimeFormat::utcNow()]; $fields = ['last_read_id' => $last_read_id, 'version' => $version, 'updated_at' => DateTimeFormat::utcNow()];
DBA::update('application-marker', $fields, $condition, true); DBA::update('application-marker', $fields, $condition, true);
System::jsonExit($this->fetchTimelines($application['id'], $uid)); $this->jsonExit($this->fetchTimelines($application['id'], $uid));
} }
/** /**
@ -73,7 +73,7 @@ class Markers extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$application = self::getCurrentApplication(); $application = self::getCurrentApplication();
System::jsonExit($this->fetchTimelines($application['id'], $uid)); $this->jsonExit($this->fetchTimelines($application['id'], $uid));
} }
private function fetchTimelines(int $application_id, int $uid) private function fetchTimelines(int $application_id, int $uid)

8
src/Module/Api/Mastodon/Media.php
View File

@ -58,7 +58,7 @@ class Media extends BaseApi
Logger::info('Uploaded photo', ['media' => $media]); Logger::info('Uploaded photo', ['media' => $media]);
System::jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id'])); $this->jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
} }
public function put(array $request = []) public function put(array $request = [])
@ -87,12 +87,12 @@ class Media extends BaseApi
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->RecordNotFound();
} }
Post\Media::updateById(['description' => $request['description']], $this->parameters['id']); Post\Media::updateById(['description' => $request['description']], $this->parameters['id']);
System::jsonExit(DI::mstdnAttachment()->createFromId($this->parameters['id'])); $this->jsonExit(DI::mstdnAttachment()->createFromId($this->parameters['id']));
} }
Photo::update(['desc' => $request['description']], ['resource-id' => $photo['resource-id']]); Photo::update(['desc' => $request['description']], ['resource-id' => $photo['resource-id']]);
System::jsonExit(DI::mstdnAttachment()->createFromPhoto($this->parameters['id'])); $this->jsonExit(DI::mstdnAttachment()->createFromPhoto($this->parameters['id']));
} }
/** /**
@ -112,6 +112,6 @@ class Media extends BaseApi
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->RecordNotFound();
} }
System::jsonExit(DI::mstdnAttachment()->createFromPhoto($id)); $this->jsonExit(DI::mstdnAttachment()->createFromPhoto($id));
} }
} }

2
src/Module/Api/Mastodon/Mutes.php
View File

@ -85,6 +85,6 @@ class Mutes extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($accounts); $this->jsonExit($accounts);
} }
} }

6
src/Module/Api/Mastodon/Notifications.php
View File

@ -48,7 +48,7 @@ class Notifications extends BaseApi
$id = $this->parameters['id']; $id = $this->parameters['id'];
try { try {
$notification = DI::notification()->selectOneForUser($uid, ['id' => $id]); $notification = DI::notification()->selectOneForUser($uid, ['id' => $id]);
System::jsonExit(DI::mstdnNotification()->createFromNotification($notification, self::appSupportsQuotes())); $this->jsonExit(DI::mstdnNotification()->createFromNotification($notification, self::appSupportsQuotes()));
} catch (\Exception $e) { } catch (\Exception $e) {
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->RecordNotFound();
} }
@ -132,7 +132,7 @@ class Notifications extends BaseApi
if ($request['summary']) { if ($request['summary']) {
$count = DI::notification()->countForUser($uid, $condition); $count = DI::notification()->countForUser($uid, $condition);
System::jsonExit(['count' => $count]); $this->jsonExit(['count' => $count]);
} else { } else {
$mstdnNotifications = []; $mstdnNotifications = [];
@ -154,7 +154,7 @@ class Notifications extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($mstdnNotifications); $this->jsonExit($mstdnNotifications);
} }
} }
} }

2
src/Module/Api/Mastodon/Notifications/Clear.php
View File

@ -37,6 +37,6 @@ class Clear extends BaseApi
DI::notification()->setAllDismissedForUser($uid); DI::notification()->setAllDismissedForUser($uid);
System::jsonExit([]); $this->jsonExit([]);
} }
} }

2
src/Module/Api/Mastodon/Notifications/Dismiss.php
View File

@ -46,6 +46,6 @@ class Dismiss extends BaseApi
$Notification->setDismissed(); $Notification->setDismissed();
DI::notification()->save($Notification); DI::notification()->save($Notification);
System::jsonExit([]); $this->jsonExit([]);
} }
} }

2
src/Module/Api/Mastodon/Polls.php
View File

@ -42,6 +42,6 @@ class Polls extends BaseApi
DI::mstdnError()->UnprocessableEntity(); DI::mstdnError()->UnprocessableEntity();
} }
System::jsonExit(DI::mstdnPoll()->createFromId($this->parameters['id'], $uid)); $this->jsonExit(DI::mstdnPoll()->createFromId($this->parameters['id'], $uid));
} }
} }

2
src/Module/Api/Mastodon/Preferences.php
View File

@ -55,6 +55,6 @@ class Preferences extends BaseApi
$preferences = new \Friendica\Object\Api\Mastodon\Preferences($visibility, $sensitive, $language, $media, $spoilers); $preferences = new \Friendica\Object\Api\Mastodon\Preferences($visibility, $sensitive, $language, $media, $spoilers);
System::jsonExit($preferences); $this->jsonExit($preferences);
} }
} }

2
src/Module/Api/Mastodon/Proofs.php
View File

@ -34,6 +34,6 @@ class Proofs extends BaseApi
*/ */
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
System::jsonError(404, ['error' => 'Record not found']); $this->jsonError(404, ['error' => 'Record not found']);
} }
} }

8
src/Module/Api/Mastodon/PushSubscription.php
View File

@ -81,7 +81,7 @@ class PushSubscription extends BaseApi
$this->logger->info('Subscription stored', ['ret' => $ret, 'subscription' => $subscription]); $this->logger->info('Subscription stored', ['ret' => $ret, 'subscription' => $subscription]);
$subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid); $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
$this->response->exitWithJson($subscriptionObj->toArray()); $this->response->addJsonContent($subscriptionObj->toArray());
} }
public function put(array $request = []): void public function put(array $request = []): void
@ -120,7 +120,7 @@ class PushSubscription extends BaseApi
]); ]);
$subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid); $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
$this->response->exitWithJson($subscriptionObj->toArray()); $this->response->addJsonContent($subscriptionObj->toArray());
} }
protected function delete(array $request = []): void protected function delete(array $request = []): void
@ -137,7 +137,7 @@ class PushSubscription extends BaseApi
'uid' => $uid, 'uid' => $uid,
]); ]);
$this->response->exitWithJson([]); $this->response->addJsonContent([]);
} }
protected function rawContent(array $request = []): void protected function rawContent(array $request = []): void
@ -154,6 +154,6 @@ class PushSubscription extends BaseApi
$this->logger->info('Fetch subscription', ['application-id' => $application['id'], 'uid' => $uid]); $this->logger->info('Fetch subscription', ['application-id' => $application['id'], 'uid' => $uid]);
$subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid); $subscriptionObj = $this->subscriptionFac->createForApplicationIdAndUserId($application['id'], $uid);
$this->response->exitWithJson($subscriptionObj->toArray()); $this->response->addJsonContent($subscriptionObj->toArray());
} }
} }

2
src/Module/Api/Mastodon/Reports.php
View File

@ -82,6 +82,6 @@ class Reports extends BaseApi
$this->reportRepo->save($report); $this->reportRepo->save($report);
System::jsonExit([]); $this->jsonExit([]);
} }
} }

6
src/Module/Api/Mastodon/ScheduledStatuses.php
View File

@ -56,7 +56,7 @@ class ScheduledStatuses extends BaseApi
Post\Delayed::deleteById($this->parameters['id']); Post\Delayed::deleteById($this->parameters['id']);
System::jsonExit([]); $this->jsonExit([]);
} }
/** /**
@ -68,7 +68,7 @@ class ScheduledStatuses extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (isset($this->parameters['id'])) { if (isset($this->parameters['id'])) {
System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($this->parameters['id'], $uid)->toArray()); $this->jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($this->parameters['id'], $uid)->toArray());
} }
$request = $this->getRequest([ $request = $this->getRequest([
@ -109,6 +109,6 @@ class ScheduledStatuses extends BaseApi
} }
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($statuses); $this->jsonExit($statuses);
} }
} }

2
src/Module/Api/Mastodon/Search.php
View File

@ -91,7 +91,7 @@ class Search extends BaseApi
$result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], $this->parameters['version']); $result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], $this->parameters['version']);
} }
System::jsonExit($result); $this->jsonExit($result);
} }
/** /**

14
src/Module/Api/Mastodon/Statuses.php
View File

@ -159,7 +159,7 @@ class Statuses extends BaseApi
Item::updateDisplayCache($post['uri-id']); Item::updateDisplayCache($post['uri-id']);
System::jsonExit(DI::mstdnStatus()->createFromUriId($post['uri-id'], $uid, self::appSupportsQuotes())); $this->jsonExit(DI::mstdnStatus()->createFromUriId($post['uri-id'], $uid, self::appSupportsQuotes()));
} }
protected function post(array $request = []) protected function post(array $request = [])
@ -263,7 +263,7 @@ class Statuses extends BaseApi
$item['gravity'] = Item::GRAVITY_COMMENT; $item['gravity'] = Item::GRAVITY_COMMENT;
$item['object-type'] = Activity\ObjectType::COMMENT; $item['object-type'] = Activity\ObjectType::COMMENT;
} else { } else {
self::checkThrottleLimit(); $this->checkThrottleLimit();
$item['gravity'] = Item::GRAVITY_PARENT; $item['gravity'] = Item::GRAVITY_PARENT;
$item['object-type'] = Activity\ObjectType::NOTE; $item['object-type'] = Activity\ObjectType::NOTE;
@ -299,14 +299,14 @@ class Statuses extends BaseApi
if (empty($id)) { if (empty($id)) {
DI::mstdnError()->InternalError(); DI::mstdnError()->InternalError();
} }
System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($id, $uid)->toArray()); $this->jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($id, $uid)->toArray());
} }
$id = Item::insert($item, true); $id = Item::insert($item, true);
if (!empty($id)) { if (!empty($id)) {
$item = Post::selectFirst(['uri-id'], ['id' => $id]); $item = Post::selectFirst(['uri-id'], ['id' => $id]);
if (!empty($item['uri-id'])) { if (!empty($item['uri-id'])) {
System::jsonExit(DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, self::appSupportsQuotes())); $this->jsonExit(DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, self::appSupportsQuotes()));
} }
} }
@ -331,7 +331,7 @@ class Statuses extends BaseApi
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->RecordNotFound();
} }
System::jsonExit([]); $this->jsonExit([]);
} }
/** /**
@ -345,7 +345,7 @@ class Statuses extends BaseApi
DI::mstdnError()->UnprocessableEntity(); DI::mstdnError()->UnprocessableEntity();
} }
System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), false)); $this->jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), false));
} }
private function getApp(): string private function getApp(): string
@ -422,7 +422,7 @@ class Statuses extends BaseApi
if (preg_match("/\[url=[^\[\]]*\](.*)\[\/url\]\z/ism", $status, $matches)) { if (preg_match("/\[url=[^\[\]]*\](.*)\[\/url\]\z/ism", $status, $matches)) {
$status = preg_replace("/\[url=[^\[\]]*\].*\[\/url\]\z/ism", PageInfo::getFooterFromUrl($matches[1]), $status); $status = preg_replace("/\[url=[^\[\]]*\].*\[\/url\]\z/ism", PageInfo::getFooterFromUrl($matches[1]), $status);
} }
return $status; return $status;
} }
} }

2
src/Module/Api/Mastodon/Statuses/Bookmark.php
View File

@ -70,6 +70,6 @@ class Bookmark extends BaseApi
// Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350
$isReblog = $item['uri-id'] != $this->parameters['id']; $isReblog = $item['uri-id'] != $this->parameters['id'];
System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); $this->jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray());
} }
} }

2
src/Module/Api/Mastodon/Statuses/Card.php
View File

@ -49,6 +49,6 @@ class Card extends BaseApi
$card = DI::mstdnCard()->createFromUriId($post['uri-id']); $card = DI::mstdnCard()->createFromUriId($post['uri-id']);
System::jsonExit($card->toArray()); $this->jsonExit($card->toArray());
} }
} }

2
src/Module/Api/Mastodon/Statuses/Context.php
View File

@ -140,7 +140,7 @@ class Context extends BaseApi
$statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid, $display_quotes); $statuses['descendants'][] = DI::mstdnStatus()->createFromUriId($descendant, $uid, $display_quotes);
} }
System::jsonExit($statuses); $this->jsonExit($statuses);
} }
private static function getParents(int $id, array $parents, array $list = []) private static function getParents(int $id, array $parents, array $list = [])

2
src/Module/Api/Mastodon/Statuses/Favourite.php
View File

@ -54,6 +54,6 @@ class Favourite extends BaseApi
// Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350
$isReblog = $item['uri-id'] != $this->parameters['id']; $isReblog = $item['uri-id'] != $this->parameters['id'];
System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); $this->jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray());
} }
} }

Some files were not shown because too many files have changed in this diff Show More