starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-28 17:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update APIv2 controller

Browse Source
This commit is contained in:
DariusIII
2026-07-12 12:03:34 +02:00
parent 11734a4163
commit 1e6c6f5193
2 changed files with 69 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/ApiV2Controller.php
+25 -15
View File
@@ -36,6 +36,8 @@ use Illuminate\Support\Str;
class ApiV2Controller extends BasePageController
{
private const JSON_ENCODING_OPTIONS = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
private ApiController $api;
private ReleaseSearchService $releaseSearchService;
@@ -132,6 +134,14 @@ class ApiV2Controller extends BasePageController
event(new UserAccessedApi($user, $request->ip()));
}
/**
* @param array<string, mixed> $data
*/
private function jsonResponse(array $data, int $status = 200): JsonResponse
{
return response()->json($data, $status, [], self::JSON_ENCODING_OPTIONS);
}
/**
* Build the standard search-results JSON response.
*
@@ -155,7 +165,7 @@ class ApiV2Controller extends BasePageController
$results[] = ReleaseData::toArrayFromRelease($row, $user, $detailsBaseUrl, $getNzbBaseUrl);
}
return response()->json(array_merge(
return $this->jsonResponse(array_merge(
['Total' => $total],
$this->buildUserStatsResponse($user),
['results' => $results],
@@ -168,10 +178,10 @@ class ApiV2Controller extends BasePageController
return -1;
}
if ($request->isNotFilled('maxage')) {
return response()->json(['error' => 'Incorrect parameter (maxage must not be empty)'], 400);
return $this->jsonResponse(['error' => 'Incorrect parameter (maxage must not be empty)'], 400);
}
if (! is_numeric($request->input('maxage'))) {
return response()->json(['error' => 'Incorrect parameter (maxage must be numeric)'], 400);
return $this->jsonResponse(['error' => 'Incorrect parameter (maxage must be numeric)'], 400);
}
return (int) $request->input('maxage');
@@ -185,10 +195,10 @@ class ApiV2Controller extends BasePageController
$sort = strtolower(trim((string) $request->input('sort')));
if ($sort === '') {
return response()->json(['error' => 'Incorrect parameter (sort must not be empty)'], 400);
return $this->jsonResponse(['error' => 'Incorrect parameter (sort must not be empty)'], 400);
}
if (! preg_match('/^(cat|name|size|files|stats|posted)_(asc|desc)$/', $sort)) {
return response()->json(['error' => 'Incorrect parameter (sort must be one of: cat_asc/desc, name_asc/desc, size_asc/desc, files_asc/desc, stats_asc/desc, posted_asc/desc)'], 400);
return $this->jsonResponse(['error' => 'Incorrect parameter (sort must be one of: cat_asc/desc, name_asc/desc, size_asc/desc, files_asc/desc, stats_asc/desc, posted_asc/desc)'], 400);
}
return $sort;
@@ -258,7 +268,7 @@ class ApiV2Controller extends BasePageController
'open' => $registrationStatus['is_open'] ? 'yes' : 'no',
];
return response()->json($capabilities);
return $this->jsonResponse($capabilities);
}
/**
@@ -280,7 +290,7 @@ class ApiV2Controller extends BasePageController
$minSize = max(0, (int) $request->input('minsize', 0));
$searchName = $request->input('id', '');
if ($searchName === '' && ! imdb_id_is_valid($imdbId) && $tmdbId <= 0 && $traktId <= 0) {
return response()->json(['error' => 'Specify id (query), imdbid, tmdbid, or traktid'], 400);
return $this->jsonResponse(['error' => 'Specify id (query), imdbid, tmdbid, or traktid'], 400);
}
$offset = $this->api->offset($request);
$limit = $this->api->limit($request);
@@ -339,7 +349,7 @@ class ApiV2Controller extends BasePageController
$this->recordApiRequest($user, $request);
if ($request->has('id') && $request->isNotFilled('id')) {
return response()->json(['error' => 'Incorrect parameter (id must not be empty)'], 400);
return $this->jsonResponse(['error' => 'Incorrect parameter (id must not be empty)'], 400);
}
$offset = $this->api->offset($request);
@@ -416,7 +426,7 @@ class ApiV2Controller extends BasePageController
$this->recordApiRequest($user, $request);
if ($request->has('id') && $request->isNotFilled('id')) {
return response()->json(['error' => 'Incorrect parameter (id must not be empty)'], 400);
return $this->jsonResponse(['error' => 'Incorrect parameter (id must not be empty)'], 400);
}
$offset = $this->api->offset($request);
@@ -496,7 +506,7 @@ class ApiV2Controller extends BasePageController
$anidb = (int) $request->input('anidbid', -1);
$anilist = (int) $request->input('anilistid', -1);
if ($q === '' && $anidb <= 0 && $anilist <= 0) {
return response()->json(['error' => 'Specify id (query), anidbid, or anilistid'], 400);
return $this->jsonResponse(['error' => 'Specify id (query), anidbid, or anilistid'], 400);
}
$offset = $this->api->offset($request);
@@ -635,7 +645,7 @@ class ApiV2Controller extends BasePageController
$this->api->verifyEmptyParameter($request, 'season');
$this->api->verifyEmptyParameter($request, 'ep');
if (! $this->hasTvSearchParameters($request)) {
return response()->json(['error' => 'Specify id (query), vid, tvdbid, traktid, rid, tvmazeid, imdbid, or tmdbid'], 400);
return $this->jsonResponse(['error' => 'Specify id (query), vid, tvdbid, traktid, rid, tvmazeid, imdbid, or tmdbid'], 400);
}
$maxAge = $this->parseMaxAge($request);
if (! is_int($maxAge)) {
@@ -718,7 +728,7 @@ class ApiV2Controller extends BasePageController
return app(GetNzbController::class)->getNzb($request);
}
return response()->json(['data' => 'No such item (the guid you provided has no release in our database)'], 404);
return $this->jsonResponse(['data' => 'No such item (the guid you provided has no release in our database)'], 404);
}
public function details(Request $request): JsonResponse
@@ -728,7 +738,7 @@ class ApiV2Controller extends BasePageController
return $user;
}
if ($request->missing('id')) {
return response()->json(['error' => 'Missing parameter (guid is required for single release details)'], 400);
return $this->jsonResponse(['error' => 'Missing parameter (guid is required for single release details)'], 400);
}
$this->recordApiRequest($user, $request);
@@ -738,10 +748,10 @@ class ApiV2Controller extends BasePageController
], fn () => Release::getByGuidForApi($guid));
if ($relData === null) {
return response()->json(['error' => 'No such item'], 404);
return $this->jsonResponse(['error' => 'No such item'], 404);
}
return response()->json(DetailsData::toArrayFromRelease(
return $this->jsonResponse(DetailsData::toArrayFromRelease(
$relData,
$user,
url('/details').'/',
tests/Feature/ApiRequestMatrixTest.php
+44
View File
@@ -146,6 +146,50 @@ class ApiRequestMatrixTest extends TestCase
$this->assertSame([], $secondResponse->getData(true)['results']);
}
public function test_v2_search_keeps_category_separator_unescaped_in_json_body(): void
{
$token = (string) DB::table('users')->value('api_token');
$request = Request::create('/api/v2/search', 'GET', [
'api_token' => $token,
'id' => 'ubuntu',
]);
$releaseSearchService = Mockery::mock(ReleaseSearchService::class);
$releaseSearchService->shouldReceive('apiSearch')
->once()
->with('ubuntu', -1, 0, 100, -1, [5030], [-1], 0, 'posted_desc')
->andReturn(collect([
(object) [
'_totalrows' => 1,
'searchname' => 'Ubuntu.Movie.Release',
'guid' => 'movie-release-guid',
'categories_id' => 2040,
'category_name' => 'Movies > WEBDL',
'adddate' => '2026-01-03 00:00:00',
'size' => 123456,
'totalpart' => 10,
'grabs' => 2,
'comments' => 1,
'passwordstatus' => 0,
'postdate' => '2026-01-02 00:00:00',
],
]));
$releaseBrowseService = Mockery::mock(ReleaseBrowseService::class);
$releaseBrowseService->shouldNotReceive('getBrowseRangeForApi');
$controller = new ApiV2Controller(app(ApiController::class), $releaseSearchService, $releaseBrowseService);
$response = $controller->apiSearch($request);
$content = $response->getContent();
$this->assertSame(200, $response->getStatusCode());
$this->assertIsString($content);
$this->assertSame('Movies > WEBDL', $response->getData(true)['results'][0]['category_name']);
$this->assertStringContainsString('"category_name":"Movies > WEBDL"', $content);
$this->assertStringNotContainsString('\u003E', $content);
}
public function test_v1_search_reuses_cached_release_rows(): void
{
$token = (string) DB::table('users')->value('api_token');