Remove XXX covers processing and related code

app/Http/Controllers/Admin/AdminUserController.php

@@ -132,7 +132,6 @@ class AdminUserController extends BasePageController
                     'notes' => '',
                     'invites' => $defaultInvites,
                     'movieview' => 0,
-                    'xxxview' => 0,
                     'musicview' => 0,
                     'consoleview' => 0,
                     'gameview' => 0,
@@ -236,7 +235,7 @@ class AdminUserController extends BasePageController
                         ($request->has('movieview') ? 1 : 0),
                         ($request->has('musicview') ? 1 : 0),
                         ($request->has('gameview') ? 1 : 0),
-                        ($request->has('xxxview') ? 1 : 0),
+                        ($editedUser->xxxview ? 1 : 0),
                         ($request->has('consoleview') ? 1 : 0),
                         ($request->has('bookview') ? 1 : 0)
                     );

app/Http/Controllers/AdultController.php

@@ -3,19 +3,18 @@
 namespace App\Http\Controllers;
 
 use App\Models\Category;
-use App\Models\XxxInfo;
-use App\Services\XxxBrowseService;
+use App\Services\Releases\ReleaseBrowseService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 
 class AdultController extends BasePageController
 {
-    private XxxBrowseService $xxxBrowseService;
+    private ReleaseBrowseService $releaseBrowseService;
 
-    public function __construct(XxxBrowseService $xxxBrowseService)
+    public function __construct(ReleaseBrowseService $releaseBrowseService)
     {
         parent::__construct();
-        $this->xxxBrowseService = $xxxBrowseService;
+        $this->releaseBrowseService = $releaseBrowseService;
     }
 
     /**
@@ -26,11 +25,10 @@ class AdultController extends BasePageController
         $moviecats = Category::getChildren(Category::XXX_ROOT);
         $mtmp = [];
         foreach ($moviecats as $mcat) {
-            $mtmp[] =
-                [
-                    'id' => $mcat->id,
-                    'title' => $mcat->title,
-                ];
+            $mtmp[] = [
+                'id' => $mcat->id,
+                'title' => $mcat->title,
+            ];
         }
         $category = $request->has('t') ? $request->input('t') : Category::XXX_ROOT;
         if ($id && \in_array($id, Arr::pluck($mtmp, 'title'), false)) {
@@ -43,40 +41,24 @@ class AdultController extends BasePageController
         $catarray = [];
         $catarray[] = $category;
 
-        $ordering = $this->xxxBrowseService->getXXXOrdering();
+        $ordering = $this->releaseBrowseService->getBrowseOrdering();
         $orderby = $request->has('ob') && \in_array($request->input('ob'), $ordering, false) ? $request->input('ob') : '';
 
         $page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1;
         $offset = ($page - 1) * config('nntmux.items_per_page');
-        $rslt = $this->xxxBrowseService->getXXXRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderby, -1, $this->userdata['categoryexclusions']); // @phpstan-ignore argument.type
-        $results = $this->paginate($rslt, $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query());
-
-        $title = ($request->has('title') && ! empty($request->input('title'))) ? stripslashes($request->input('title')) : '';
-
-        $actors = ($request->has('actors') && ! empty($request->input('actors'))) ? stripslashes($request->input('actors')) : '';
-
-        $director = ($request->has('director') && ! empty($request->input('director'))) ? stripslashes($request->input('director')) : '';
-
-        $genres = XxxInfo::getAllGenres(true);
-        $genre = ($request->has('genre') && \in_array($request->input('genre'), $genres, false)) ? $request->input('genre') : '';
-
-        $browseby_link = '&title='.$title.'&actors='.$actors.'&director='.$director.'&genre='.$genre;
+        $rslt = $this->releaseBrowseService->getBrowseRange($page, $catarray, $offset, config('nntmux.items_per_page'), $orderby, -1, (array) ($this->userdata->categoryexclusions ?? []), -1);
+        $results = $this->paginate($rslt ?? [], isset($rslt[0]->_totalcount) ? $rslt[0]->_totalcount : 0, config('nntmux.items_per_page'), $page, $request->url(), $request->query());
 
         if ((int) $category === -1) {
             $catname = 'All';
         } else {
             $cdata = Category::find($category);
-            if ($cdata !== null) {
-                $catname = $cdata->title;
-            } else {
-                $catname = 'All';
-            }
+            $catname = $cdata !== null ? $cdata->title : 'All';
         }
 
-        // Build order by URLs
         $orderByUrls = [];
         foreach ($ordering as $ordertype) {
-            $orderByUrls['orderby'.$ordertype] = url('/XXX/'.($id ?: 'All').'?t='.$category.$browseby_link.'&ob='.$ordertype.'&offset=0');
+            $orderByUrls['orderby'.$ordertype] = url('/XXX/'.($id ?: 'All').'?t='.$category.'&ob='.$ordertype.'&offset=0');
         }
 
         $this->viewData = array_merge($this->viewData, [
@@ -84,11 +66,7 @@ class AdultController extends BasePageController
             'category' => $category,
             'categorytitle' => $id,
             'catname' => $catname,
-            'title' => stripslashes($title),
-            'actors' => $actors,
-            'director' => $director,
-            'genres' => $genres,
-            'genre' => $genre,
+            'ordering' => $ordering,
             'results' => $results,
             'lastvisit' => $this->userdata['lastlogin'] ?? null,
             'meta_title' => 'Browse XXX',

app/Http/Controllers/CoverController.php

@@ -18,7 +18,7 @@ class CoverController extends Controller
     public function show(string $type, string $filename)
     {
         // Validate cover type
-        $validTypes = ['anime', 'audio', 'audiosample', 'book', 'console', 'games', 'movies', 'music', 'preview', 'sample', 'tvrage', 'video', 'xxx', 'tvshows'];
+        $validTypes = ['anime', 'audio', 'audiosample', 'book', 'console', 'games', 'movies', 'music', 'preview', 'sample', 'tvrage', 'video', 'tvshows'];
 
         if (! in_array($type, $validTypes)) {
             abort(404);

app/Http/Controllers/DetailsController.php

@@ -13,7 +13,6 @@ use App\Models\ReleaseReport;
 use App\Models\Settings;
 use App\Models\UserDownload;
 use App\Models\Video;
-use App\Models\XxxInfo;
 use App\Services\AnidbService;
 use App\Services\BookService;
 use App\Services\ConsoleService;
@@ -22,7 +21,6 @@ use App\Services\MovieService;
 use App\Services\MusicService;
 use App\Services\ReleaseExtraService;
 use App\Services\Releases\ReleaseSearchService;
-use App\Services\XxxBrowseService;
 use Illuminate\Http\Request;
 
 class DetailsController extends BasePageController
@@ -31,20 +29,16 @@ class DetailsController extends BasePageController
 
     private MovieService $movieService;
 
-    private XxxBrowseService $xxxBrowseService;
-
     private ReleaseExtraService $releaseExtraService;
 
     public function __construct(
         ReleaseSearchService $releaseSearchService,
         MovieService $movieService,
-        XxxBrowseService $xxxBrowseService,
         ReleaseExtraService $releaseExtraService
     ) {
         parent::__construct();
         $this->releaseSearchService = $releaseSearchService;
         $this->movieService = $movieService;
-        $this->xxxBrowseService = $xxxBrowseService;
         $this->releaseExtraService = $releaseExtraService;
     }
 
@@ -104,24 +98,6 @@ class DetailsController extends BasePageController
             }
         }
 
-        $xxx = '';
-        if ($data['xxxinfo_id'] !== '' && $data['xxxinfo_id'] !== 0) {
-            $xxx = XxxInfo::getXXXInfo($data['xxxinfo_id']);
-
-            if (isset($xxx['trailers'])) {
-                $xxx['trailers'] = $this->xxxBrowseService->insertSwf($xxx['classused'], $xxx['trailers']);
-            }
-
-            if ($xxx && isset($xxx['title'])) {
-                $xxx['title'] = str_replace(['/', '\\'], '', $xxx['title']);
-                $xxx['actors'] = makeFieldLinks($xxx, 'actors', 'xxx');
-                $xxx['genre'] = makeFieldLinks($xxx, 'genre', 'xxx');
-                $xxx['director'] = makeFieldLinks($xxx, 'director', 'xxx');
-            } else {
-                $xxx = false;
-            }
-        }
-
         $game = '';
         if (! empty($data['gamesinfo_id'])) {
             $game = (new GamesService)->getGamesInfoById($data['gamesinfo_id']);
@@ -176,7 +152,6 @@ class DetailsController extends BasePageController
             'nfo' => $nfo,
             'show' => $showInfo,
             'movie' => $mov,
-            'xxx' => $xxx,
             'anidb' => $AniDBAPIArray,
             'music' => $mus,
             'con' => $con,

app/Http/Controllers/ProfileController.php

@@ -149,7 +149,7 @@ class ProfileController extends BasePageController
                         $request->has('movieview') ? 1 : 0,
                         $request->has('musicview') ? 1 : 0,
                         $request->has('gameview') ? 1 : 0,
-                        $request->has('xxxview') ? 1 : 0,
+                        $this->userdata->xxxview ? 1 : 0,
                         $request->has('consoleview') ? 1 : 0,
                         $request->has('bookview') ? 1 : 0,
                         'None',