diff --git a/Blacklight/Music.php b/Blacklight/Music.php index 4aaba3d16..ffa0237fa 100755 --- a/Blacklight/Music.php +++ b/Blacklight/Music.php @@ -4,7 +4,6 @@ namespace Blacklight; use ApaiIO\ApaiIO; use App\Models\Genre; -use Illuminate\Support\Facades\DB; use GuzzleHttp\Client; use App\Models\Release; use App\Models\Category; @@ -13,6 +12,7 @@ use App\Models\MusicInfo; use ApaiIO\Operations\Search; use Illuminate\Support\Carbon; use ApaiIO\Request\GuzzleRequest; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Cache; use ApaiIO\Configuration\GenericConfiguration; use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject; @@ -24,7 +24,6 @@ class Music { protected const MATCH_PERCENT = 60; - protected $pdo; /** @@ -133,16 +132,16 @@ class Music return MusicInfo::search($searchwords)->first(); } -/** -* @param $cat -* @param $start -* @param $num -* @param $orderby -* @param array $excludedcats -* -* @return array -* @throws \Exception -*/ + /** + * @param $cat + * @param $start + * @param $num + * @param $orderby + * @param array $excludedcats + * + * @return array + * @throws \Exception + */ public function getMusicRange($page, $cat, $start, $num, $orderby, array $excludedcats = []) { $browseby = $this->getBrowseBy(); @@ -227,6 +226,7 @@ class Music $return['_totalcount'] = $music['total'] ?? 0; } Cache::put(md5($sql.$page), $return, $expiresAt); + return $return; } diff --git a/Blacklight/XXX.php b/Blacklight/XXX.php index 68f63afe0..b139c5dbe 100755 --- a/Blacklight/XXX.php +++ b/Blacklight/XXX.php @@ -215,6 +215,7 @@ class XXX $return['_totalcount'] = $xxxmovies['total'][0]->total ?? 0; } Cache::put(md5($sql.$page), $return, $expiresAt); + return $return; } @@ -270,6 +271,7 @@ class XXX } } } + return $browseBy; } diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index cb69fcc55..6d6c34f75 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -53,7 +53,6 @@ class MusicController extends BasePageController $ordering = $music->getMusicOrdering(); $orderby = request()->has('ob') && \in_array(request()->input('ob'), $ordering, false) ? request()->input('ob') : ''; - $musics = []; $rslt = $music->getMusicRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']); $results = $this->paginate($rslt, $rslt['_totalcount'][0]->total, config('nntmux.items_per_cover_page'), $page, $request->url());