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

Transform ApiResponse::error() into dynamic method

Browse source
This commit is contained in:
Philipp 2021-11-12 20:04:47 +01:00
parent ea0f41ecf0
commit ebf56674f1
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/api.php
View file

@ -283,7 +283,7 @@ function api_call(App $a, App\Arguments $args = null)
Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call', 'query' => DI::args()->getQueryString()]); Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call', 'query' => DI::args()->getQueryString()]);
throw new NotFoundException(); throw new NotFoundException();
} catch (HTTPException $e) { } catch (HTTPException $e) {
ApiResponse::error($e->getCode(), $e->getDescription(), $e->getMessage(), $type); DI::apiResponse()->error($e->getCode(), $e->getDescription(), $e->getMessage(), $type);
} }
} }

6
src/Module/Api/ApiResponse.php
View file

@ -135,17 +135,17 @@ class ApiResponse
* *
* @return void * @return void
*/ */
public static function error(int $code, string $description, string $message, string $format = null) public function error(int $code, string $description, string $message, string $format = null)
{ {
$error = [ $error = [
'error' => $message ?: $description, 'error' => $message ?: $description,
'code' => $code . ' ' . $description, 'code' => $code . ' ' . $description,
'request' => DI::args()->getQueryString() 'request' => $this->args->getQueryString()
]; ];
header(($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1') . ' ' . $code . ' ' . $description); header(($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1') . ' ' . $code . ' ' . $description);
DI::apiResponse()->exit('status', ['status' => $error], $format); $this->exit('status', ['status' => $error], $format);
} }
/** /**

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

@ -60,7 +60,7 @@ class Activity extends BaseApi
} }
DI::apiResponse()->exit('ok', ['ok' => $ok], $parameters['extension'] ?? null); DI::apiResponse()->exit('ok', ['ok' => $ok], $parameters['extension'] ?? null);
} else { } else {
ApiResponse::error(500, 'Error adding activity', '', $parameters['extension'] ?? null); DI::apiResponse()->error(500, 'Error adding activity', '', $parameters['extension'] ?? null);
} }
} }
} }