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

[friendica.git] / src / Module / BaseApi.php

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 5b44073f3f6ce4bfee39194aa00c858517a476de..a34f25f938726bf87bf5f2c9fc9a21810521fee4 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -32,8 +32,6 @@ use Friendica\Security\OAuth;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPInputData;
 
-require_once __DIR__ . '/../../include/api.php';
-
 class BaseApi extends BaseModule
 {
        const SCOPE_READ   = 'read';
@@ -41,11 +39,6 @@ class BaseApi extends BaseModule
        const SCOPE_FOLLOW = 'follow';
        const SCOPE_PUSH   = 'push';
 
-       /**
-        * @var string json|xml|rss|atom
-        */
-       protected static $format = 'json';
-
        /**
         * @var array
         */
@@ -56,22 +49,7 @@ class BaseApi extends BaseModule
         */
        protected static $request = [];
 
-       public static function init(array $parameters = [])
-       {
-               $arguments = DI::args();
-
-               if (substr($arguments->getCommand(), -4) === '.xml') {
-                       self::$format = 'xml';
-               }
-               if (substr($arguments->getCommand(), -4) === '.rss') {
-                       self::$format = 'rss';
-               }
-               if (substr($arguments->getCommand(), -4) === '.atom') {
-                       self::$format = 'atom';
-               }
-       }
-
-       public static function delete(array $parameters = [])
+       public function delete()
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -80,7 +58,7 @@ class BaseApi extends BaseModule
                }
        }
 
-       public static function patch(array $parameters = [])
+       public function patch()
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -89,7 +67,7 @@ class BaseApi extends BaseModule
                }
        }
 
-       public static function post(array $parameters = [])
+       public function post()
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -98,7 +76,7 @@ class BaseApi extends BaseModule
                }
        }
 
-       public static function put(array $parameters = [])
+       public function put()
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -107,22 +85,6 @@ class BaseApi extends BaseModule
                }
        }
 
-       /**
-        * Quit execution with the message that the endpoint isn't implemented
-        *
-        * @param string $method
-        * @return void
-        */
-       public static function unsupported(string $method = 'all')
-       {
-               $path = DI::args()->getQueryString();
-               Logger::info('Unimplemented API call', ['method' => $method, 'path' => $path, 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'request' => HTTPInputData::process()]);
-               $error = DI::l10n()->t('API endpoint %s %s is not implemented', strtoupper($method), $path);
-               $error_description = DI::l10n()->t('The API endpoint is currently not implemented but might be in the future.');
-               $errorobj = new \Friendica\Object\Api\Mastodon\Error($error, $error_description);
-               System::jsonError(501, $errorobj->toArray());
-       }
-
        /**
         * Processes data from GET requests and sets defaults
         *
@@ -173,7 +135,6 @@ class BaseApi extends BaseModule
         * Set boundaries for the "link" header
         * @param array $boundaries
         * @param int $id
-        * @return array
         */
        protected static function setBoundaries(int $id)
        {
@@ -239,7 +200,7 @@ class BaseApi extends BaseModule
         *
         * @return int User ID
         */
-       protected static function getCurrentUserID()
+       public static function getCurrentUserID()
        {
                $uid = OAuth::getCurrentUserID();
 
@@ -329,69 +290,4 @@ class BaseApi extends BaseModule
                        }
                }
        }
-
-       /**
-        * Get user info array.
-        *
-        * @param int|string $contact_id Contact ID or URL
-        * @return array|bool
-        * @throws HTTPException\BadRequestException
-        * @throws HTTPException\InternalServerErrorException
-        * @throws HTTPException\UnauthorizedException
-        * @throws \ImagickException
-        */
-       protected static function getUser($contact_id = null)
-       {
-               return api_get_user(DI::app(), $contact_id);
-       }
-
-       /**
-        * Formats the data according to the data type
-        *
-        * @param string $root_element
-        * @param array $data An array with a single element containing the returned result
-        * @return false|string
-        */
-       protected static function format(string $root_element, array $data)
-       {
-               $return = api_format_data($root_element, self::$format, $data);
-
-               switch (self::$format) {
-                       case "xml":
-                               header("Content-Type: text/xml");
-                               break;
-                       case "json":
-                               header("Content-Type: application/json");
-                               if (!empty($return)) {
-                                       $json = json_encode(end($return));
-                                       if (!empty($_GET['callback'])) {
-                                               $json = $_GET['callback'] . "(" . $json . ")";
-                                       }
-                                       $return = $json;
-                               }
-                               break;
-                       case "rss":
-                               header("Content-Type: application/rss+xml");
-                               $return  = '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $return;
-                               break;
-                       case "atom":
-                               header("Content-Type: application/atom+xml");
-                               $return = '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $return;
-                               break;
-               }
-
-               return $return;
-       }
-
-       /**
-        * Creates the XML from a JSON style array
-        *
-        * @param $data
-        * @param $root_element
-        * @return string
-        */
-       protected static function createXml($data, $root_element)
-       {
-               return api_create_xml($data, $root_element);
-       }
 }