Merge pull request #3337 from Roardom/enforce-max-perpage

(Update) Enforce max torrents per page
HDInnovations · Jan 2, 2024 · e51d3a3 · e51d3a3
2 parents d64d87b + 5fd8ac8
commit e51d3a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/Http/Controllers/API/TorrentController.php b/app/Http/Controllers/API/TorrentController.php
@@ -447,7 +447,7 @@ public function filter(Request $request): TorrentsResource|\Illuminate\Http\Json
                 ->when($request->filled('episodeNumber'), fn ($query) => $query->ofEpisode((int) $request->episodeNumber))
                 ->latest('sticky')
                 ->orderBy($request->input('sortField') ?? $this->sortField, $request->input('sortDirection') ?? $this->sortDirection)
-                ->cursorPaginate($request->input('perPage') ?? $this->perPage);
+                ->cursorPaginate(min($request->input('perPage') ?? $this->perPage, 100));
 
             $movieIds = $torrents->getCollection()->where('meta', '=', 'movie')->pluck('tmdb');
             $tvIds = $torrents->getCollection()->where('meta', '=', 'tv')->pluck('tmdb');

diff --git a/app/Http/Livewire/TorrentSearch.php b/app/Http/Livewire/TorrentSearch.php
@@ -310,7 +310,7 @@ final public function getTorrentsProperty(): \Illuminate\Contracts\Pagination\Le
             ->where($this->filters())
             ->latest('sticky')
             ->orderBy($this->sortField, $this->sortDirection)
-            ->paginate($this->perPage);
+            ->paginate(min($this->perPage, 100));
 
         $movieIds = $torrents->getCollection()->where('meta', '=', 'movie')->pluck('tmdb');
         $tvIds = $torrents->getCollection()->where('meta', '=', 'tv')->pluck('tmdb');
@@ -362,7 +362,7 @@ final public function getGroupedTorrentsProperty()
             ->groupBy('tmdb', 'meta')
             ->latest('sticky')
             ->orderBy($this->sortField, $this->sortDirection)
-            ->paginate($this->perPage);
+            ->paginate(min($this->perPage, 100));
 
         $movieIds = $groups->getCollection()->where('meta', '=', 'movie')->pluck('tmdb');
         $tvIds = $groups->getCollection()->where('meta', '=', 'tv')->pluck('tmdb');
@@ -602,7 +602,7 @@ final public function getGroupedPostersProperty()
             ->groupBy('tmdb', 'meta')
             ->latest('sticky')
             ->orderBy($this->sortField, $this->sortDirection)
-            ->paginate($this->perPage);
+            ->paginate(min($this->perPage, 100));
 
         $movieIds = $groups->getCollection()->where('meta', '=', 'movie')->pluck('tmdb');
         $tvIds = $groups->getCollection()->where('meta', '=', 'tv')->pluck('tmdb');