From 246f3c5a8fd477fbe94068b884166ff55069a442 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 11 Jun 2021 06:09:08 +0000 Subject: [PATCH] Making the tests happy --- include/api.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/include/api.php b/include/api.php index 92230cc611..0ebd9b7514 100644 --- a/include/api.php +++ b/include/api.php @@ -116,11 +116,22 @@ function api_user() */ function api_source() { - $application = OAuth::getCurrentApplicationToken(); - if (empty($application)) { - $application = BasicAuth::getCurrentApplicationToken(); + if (requestdata('source')) { + return requestdata('source'); } - return $application['name'] ?? 'api'; + + // Support for known clients that doesn't send a source name + if (!empty($_SERVER['HTTP_USER_AGENT'])) { + if(strpos($_SERVER['HTTP_USER_AGENT'], "Twidere") !== false) { + return "Twidere"; + } + + Logger::info(API_LOG_PREFIX . 'Unrecognized user-agent', ['module' => 'api', 'action' => 'source', 'http_user_agent' => $_SERVER['HTTP_USER_AGENT']]); + } else { + Logger::info(API_LOG_PREFIX . 'Empty user-agent', ['module' => 'api', 'action' => 'source']); + } + + return "api"; } /**