From ebf56674f1d36d50052b29ca6f5e12d882f7296b Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 12 Nov 2021 20:04:47 +0100
Subject: [PATCH] Transform ApiResponse::error() into dynamic method

---
 include/api.php                       | 2 +-
 src/Module/Api/ApiResponse.php        | 6 +++---
 src/Module/Api/Friendica/Activity.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/api.php b/include/api.php
index 346863f741..4aafadfab1 100644
--- a/include/api.php
+++ b/include/api.php
@@ -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()]);
 		throw new NotFoundException();
 	} catch (HTTPException $e) {
-		ApiResponse::error($e->getCode(), $e->getDescription(), $e->getMessage(), $type);
+		DI::apiResponse()->error($e->getCode(), $e->getDescription(), $e->getMessage(), $type);
 	}
 }
 
diff --git a/src/Module/Api/ApiResponse.php b/src/Module/Api/ApiResponse.php
index 47d52ca1fc..d09cfe3bc5 100644
--- a/src/Module/Api/ApiResponse.php
+++ b/src/Module/Api/ApiResponse.php
@@ -135,17 +135,17 @@ class ApiResponse
 	 *
 	 * @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'   => $message ?: $description,
 			'code'    => $code . ' ' . $description,
-			'request' => DI::args()->getQueryString()
+			'request' => $this->args->getQueryString()
 		];
 
 		header(($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1') . ' ' . $code . ' ' . $description);
 
-		DI::apiResponse()->exit('status', ['status' => $error], $format);
+		$this->exit('status', ['status' => $error], $format);
 	}
 
 	/**
diff --git a/src/Module/Api/Friendica/Activity.php b/src/Module/Api/Friendica/Activity.php
index 2f4c0ff53a..fa27876d3b 100644
--- a/src/Module/Api/Friendica/Activity.php
+++ b/src/Module/Api/Friendica/Activity.php
@@ -60,7 +60,7 @@ class Activity extends BaseApi
 			}
 			DI::apiResponse()->exit('ok', ['ok' => $ok], $parameters['extension'] ?? null);
 		} else {
-			ApiResponse::error(500, 'Error adding activity', '', $parameters['extension'] ?? null);
+			DI::apiResponse()->error(500, 'Error adding activity', '', $parameters['extension'] ?? null);
 		}
 	}
 }