diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php index 13fed5ceb..d8e7adf00 100644 --- a/app/Http/Controllers/Api/ApiController.php +++ b/app/Http/Controllers/Api/ApiController.php @@ -225,6 +225,7 @@ class ApiController extends BasePageController $minSize ); } + return $this->output($relData, $params, $outputXML, $offset, 'api'); // Search tv releases. case 'tv': @@ -339,6 +340,7 @@ class ApiController extends BasePageController -1, $minSize ); + return $this->output($relData, $params, $outputXML, $offset, 'api'); } @@ -417,6 +419,7 @@ class ApiController extends BasePageController $sort ); } + return $this->output($relData, $params, $outputXML, $offset, 'api'); case 'book': @@ -465,6 +468,7 @@ class ApiController extends BasePageController $sort ); } + return $this->output($relData, $params, $outputXML, $offset, 'api'); case 'anime': @@ -494,6 +498,7 @@ class ApiController extends BasePageController $anilist, $sort ); + return $this->output($relData, $params, $outputXML, $offset, 'api'); // Get NZB. @@ -633,7 +638,6 @@ class ApiController extends BasePageController return showApiError(603, 'Failed to write file to disk'); - // Capabilities request. case 'c': return $this->output([], $params, $outputXML, $offset, 'caps'); diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 7c7bccee3..8b9b8347a 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -27,6 +27,7 @@ class RssController extends BasePageController /** * @return JsonResponse|Response + * * @throws \Throwable */ public function myMoviesRss(Request $request) @@ -46,6 +47,7 @@ class RssController extends BasePageController /** * @return JsonResponse|Response + * * @throws \Throwable */ public function myShowsRss(Request $request) @@ -66,6 +68,7 @@ class RssController extends BasePageController /** * @return JsonResponse|Response + * * @throws \Throwable */ public function fullFeedRss(Request $request) @@ -78,6 +81,7 @@ class RssController extends BasePageController [$userShow, $userAnidb, $userAirDate, $userNum, $userLimit, $outputXML] = $this->parseCommonRssParams($request); $relData = $this->rss->getRss([0], $userShow, $userAnidb, $user['user_id'], $userAirDate, $userLimit, $userNum); + return $this->rss->output($relData, $user['params'], $outputXML, 0, 'rss'); } @@ -110,6 +114,7 @@ class RssController extends BasePageController /** * @return JsonResponse|Response + * * @throws \Throwable */ public function cartRss(Request $request) @@ -146,6 +151,7 @@ class RssController extends BasePageController /** * @return JsonResponse|Response + * * @throws \Throwable */ public function categoryFeedRss(Request $request) @@ -169,6 +175,7 @@ class RssController extends BasePageController /** * @return JsonResponse|Response + * * @throws \Throwable */ public function trendingMoviesRss(Request $request) @@ -186,6 +193,7 @@ class RssController extends BasePageController /** * @return JsonResponse|Response + * * @throws \Throwable */ public function trendingShowsRss(Request $request) diff --git a/app/Models/TrustedDevice.php b/app/Models/TrustedDevice.php index d0203522d..9f99b4852 100644 --- a/app/Models/TrustedDevice.php +++ b/app/Models/TrustedDevice.php @@ -100,4 +100,3 @@ class TrustedDevice extends Model return hash_hmac('sha256', $plainToken, (string) config('app.key')); } } - diff --git a/app/Observers/UserApiCacheObserver.php b/app/Observers/UserApiCacheObserver.php index 1ff432285..403a66295 100644 --- a/app/Observers/UserApiCacheObserver.php +++ b/app/Observers/UserApiCacheObserver.php @@ -47,4 +47,3 @@ class UserApiCacheObserver Cache::forget('api_user_stats:'.$user->id); } } - diff --git a/app/Providers/UserServiceProvider.php b/app/Providers/UserServiceProvider.php index 0df5bc950..6216d86ef 100644 --- a/app/Providers/UserServiceProvider.php +++ b/app/Providers/UserServiceProvider.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace App\Providers; use App\Models\User; -use App\Observers\UserApiCacheObserver; use App\Observers\UserActivityObserver; +use App\Observers\UserApiCacheObserver; use App\Observers\UserServiceObserver; use Illuminate\Support\ServiceProvider; diff --git a/database/migrations/2026_06_10_000000_create_trusted_devices_table.php b/database/migrations/2026_06_10_000000_create_trusted_devices_table.php index 15174df84..de97658a5 100644 --- a/database/migrations/2026_06_10_000000_create_trusted_devices_table.php +++ b/database/migrations/2026_06_10_000000_create_trusted_devices_table.php @@ -29,4 +29,3 @@ return new class extends Migration Schema::dropIfExists('trusted_devices'); } }; - diff --git a/routes/rss.php b/routes/rss.php index 57688ae47..5fb48d690 100644 --- a/routes/rss.php +++ b/routes/rss.php @@ -14,18 +14,18 @@ use App\Http\Controllers\RssController; Route::middleware('apiRateLimit')->group(function (): void { - Route::get('mymovies', [RssController::class, 'myMoviesRss']); - Route::post('mymovies', [RssController::class, 'myMoviesRss']); - Route::get('myshows', [RssController::class, 'myShowsRss']); - Route::post('myshows', [RssController::class, 'myShowsRss']); - Route::get('full-feed', [RssController::class, 'fullFeedRss']); - Route::post('full-feed', [RssController::class, 'fullFeedRss']); - Route::get('cart', [RssController::class, 'cartRss']); - Route::post('cart', [RssController::class, 'cartRss']); - Route::get('category', [RssController::class, 'categoryFeedRss']); - Route::post('category', [RssController::class, 'categoryFeedRss']); - Route::get('trending-movies', [RssController::class, 'trendingMoviesRss']); - Route::post('trending-movies', [RssController::class, 'trendingMoviesRss']); - Route::get('trending-shows', [RssController::class, 'trendingShowsRss']); - Route::post('trending-shows', [RssController::class, 'trendingShowsRss']); + Route::get('mymovies', [RssController::class, 'myMoviesRss']); + Route::post('mymovies', [RssController::class, 'myMoviesRss']); + Route::get('myshows', [RssController::class, 'myShowsRss']); + Route::post('myshows', [RssController::class, 'myShowsRss']); + Route::get('full-feed', [RssController::class, 'fullFeedRss']); + Route::post('full-feed', [RssController::class, 'fullFeedRss']); + Route::get('cart', [RssController::class, 'cartRss']); + Route::post('cart', [RssController::class, 'cartRss']); + Route::get('category', [RssController::class, 'categoryFeedRss']); + Route::post('category', [RssController::class, 'categoryFeedRss']); + Route::get('trending-movies', [RssController::class, 'trendingMoviesRss']); + Route::post('trending-movies', [RssController::class, 'trendingMoviesRss']); + Route::get('trending-shows', [RssController::class, 'trendingShowsRss']); + Route::post('trending-shows', [RssController::class, 'trendingShowsRss']); }); diff --git a/tests/Feature/Auth/RememberMeAuthenticationTest.php b/tests/Feature/Auth/RememberMeAuthenticationTest.php index 0d2b4fa4a..21260a82b 100644 --- a/tests/Feature/Auth/RememberMeAuthenticationTest.php +++ b/tests/Feature/Auth/RememberMeAuthenticationTest.php @@ -258,4 +258,3 @@ class RememberMeAuthenticationTest extends TestCase return $user->fresh(); } } - diff --git a/tests/Feature/NzbAndRssAccessTest.php b/tests/Feature/NzbAndRssAccessTest.php index 71ad88671..be6196276 100644 --- a/tests/Feature/NzbAndRssAccessTest.php +++ b/tests/Feature/NzbAndRssAccessTest.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace Tests\Feature; -use App\Http\Middleware\TrustedDevice2FAMiddleware; use App\Http\Controllers\Api\RSS; +use App\Http\Middleware\TrustedDevice2FAMiddleware; use App\Models\TrustedDevice; use App\Models\User; use App\View\Composers\GlobalDataComposer; use Illuminate\Contracts\Console\Kernel; -use Illuminate\Http\Request; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; @@ -452,7 +452,7 @@ class NzbAndRssAccessTest extends TestCase ]); $request->setLaravelSession(app('session.store')); - (new TrustedDevice2FAMiddleware())->handle($request, fn () => response('ok')); + (new TrustedDevice2FAMiddleware)->handle($request, fn () => response('ok')); $this->assertFalse((bool) $request->session()->get('google2fa', false)); } @@ -484,7 +484,7 @@ class NzbAndRssAccessTest extends TestCase ]); $request->setLaravelSession(app('session.store')); - (new TrustedDevice2FAMiddleware())->handle($request, fn () => response('ok')); + (new TrustedDevice2FAMiddleware)->handle($request, fn () => response('ok')); $this->assertTrue((bool) $request->session()->get('google2fa', false)); }