Remove DI dependency in Object\Api\Mastodon\Instance

[friendica.git] / src / BaseModule.php

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 5ebeec3c8099d6064d22d5d9476a923817ec4e02..c04b835c52ff4bb324c388dae1ebc940ffbc5a88 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -189,6 +189,11 @@ abstract class BaseModule implements ICanHandleRequests
                        $this->response->setHeader('*', 'Access-Control-Allow-Headers');
                        $this->response->setHeader(Router::GET, 'Access-Control-Allow-Methods');
                        $this->response->setHeader('false', 'Access-Control-Allow-Credentials');
+               } elseif (substr($this->args->getQueryString(), 0, 9) == 'nodeinfo/') {
+                       $this->response->setHeader('*', 'Access-Control-Allow-Origin');
+                       $this->response->setHeader('*', 'Access-Control-Allow-Headers');
+                       $this->response->setHeader(Router::GET, 'Access-Control-Allow-Methods');
+                       $this->response->setHeader('false', 'Access-Control-Allow-Credentials');
                } elseif (substr($this->args->getQueryString(), 0, 8) == 'profile/') {
                        $this->response->setHeader('*', 'Access-Control-Allow-Origin');
                        $this->response->setHeader('*', 'Access-Control-Allow-Headers');
@@ -488,11 +493,45 @@ abstract class BaseModule implements ICanHandleRequests
        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->logger->debug('Exit with error', ['code' => $httpCode, 'message' => $message, '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, 'method' => $this->args->getMethod(), 'agent' => $this->server['HTTP_USER_AGENT'] ?? '']);
+               }
+
+               $this->response->setStatus($httpCode);
+               $this->jsonExit($content, $content_type);
+       }
 }