From 609a2f31e1cd56cfa9bbcef64545bb9f4a0a87c4 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sat, 13 Jul 2019 11:47:24 +0200 Subject: [PATCH] Improve newly added variables handling --- app/Http/Controllers/Api/ApiController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php index ebb1fd9d8..9789a07bc 100644 --- a/app/Http/Controllers/Api/ApiController.php +++ b/app/Http/Controllers/Api/ApiController.php @@ -65,7 +65,7 @@ class ApiController extends BasePageController $uid = $apiKey = ''; $res = $catExclusions = []; - $maxRequests = 0; + $maxRequests = $apiRequests = $maxDownloads = $grabs = 0; // Page is accessible only by the apikey @@ -94,6 +94,7 @@ class ApiController extends BasePageController if ($uid !== '') { event(new UserAccessedApi($res)); $apiRequests = UserRequest::getApiRequests($uid); + $grabs = UserDownload::getDownloadRequests($uid); if ($apiRequests > $maxRequests) { Utility::showApiError(500, 'Request limit reached ('.$apiRequests.'/'.$maxRequests.')'); } @@ -113,9 +114,9 @@ class ApiController extends BasePageController $params['uid'] = $uid; $params['token'] = $apiKey; $params['apilimit'] = $maxRequests; - $params['requests'] = $apiRequests ?? 0; + $params['requests'] = $apiRequests; $params['downloadlimit'] = $maxDownloads; - $params['grabs'] = UserDownload::getDownloadRequests($uid); + $params['grabs'] = $grabs; switch ($function) { // Search releases.