mirror of
https://github.com/NNTmux/newznab-tmux.git
synced 2026-08-29 00:01:21 +00:00
Fix category matches
This commit is contained in:
@@ -62,9 +62,9 @@ class Releases extends Release
|
|||||||
if ($cat) {
|
if ($cat) {
|
||||||
$categories = Category::getCategorySearch($cat, null, true);
|
$categories = Category::getCategorySearch($cat, null, true);
|
||||||
// If categories is empty, we don't want to return anything.
|
// If categories is empty, we don't want to return anything.
|
||||||
if (! empty($categories)) {
|
if ($categories !== null) {
|
||||||
// if we have more than one category, we need to use whereIn
|
// if we have more than one category, we need to use whereIn
|
||||||
if (\count($categories) > 1) {
|
if (count(Arr::wrap($categories)) > 1) {
|
||||||
$query->whereIn('categories_id', $categories);
|
$query->whereIn('categories_id', $categories);
|
||||||
} else {
|
} else {
|
||||||
$query->where('categories_id', $categories);
|
$query->where('categories_id', $categories);
|
||||||
@@ -93,7 +93,6 @@ class Releases extends Release
|
|||||||
$query->orderBy($orderBy[0], $orderBy[1])
|
$query->orderBy($orderBy[0], $orderBy[1])
|
||||||
->skip($start)
|
->skip($start)
|
||||||
->take($num);
|
->take($num);
|
||||||
|
|
||||||
$releases = Cache::get(md5($query->toSql().$page));
|
$releases = Cache::get(md5($query->toSql().$page));
|
||||||
if ($releases !== null) {
|
if ($releases !== null) {
|
||||||
return $releases;
|
return $releases;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Models;
|
|||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
use Illuminate\Support\Facades\Cache;
|
use Illuminate\Support\Facades\Cache;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
@@ -343,7 +344,7 @@ class Category extends Model
|
|||||||
if ($builder) {
|
if ($builder) {
|
||||||
return match ($catCount) {
|
return match ($catCount) {
|
||||||
0 => null,
|
0 => null,
|
||||||
1 => $categories[0] !== -1 ? $categories[0] : null,
|
1 => $categories[0] !== -1 ? $categories : null,
|
||||||
default => $categories,
|
default => $categories,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -1,25 +1,25 @@
|
|||||||
{
|
{
|
||||||
"resources/css/app.css": {
|
"resources/css/app.css": {
|
||||||
"file": "assets/app-BeJLlIBX.css",
|
"file": "assets/app-BRbGd3gy.css",
|
||||||
"src": "resources/css/app.css",
|
"src": "resources/css/app.css",
|
||||||
"isEntry": true
|
"isEntry": true
|
||||||
},
|
},
|
||||||
"resources/forum/livewire-tailwind/css/forum.css": {
|
"resources/forum/livewire-tailwind/css/forum.css": {
|
||||||
"file": "assets/forum-j5Lwchy2.css",
|
"file": "assets/forum-CK4arI1a.css",
|
||||||
"src": "resources/forum/livewire-tailwind/css/forum.css",
|
"src": "resources/forum/livewire-tailwind/css/forum.css",
|
||||||
"isEntry": true
|
"isEntry": true
|
||||||
},
|
},
|
||||||
"resources/forum/livewire-tailwind/js/forum.js": {
|
"resources/forum/livewire-tailwind/js/forum.js": {
|
||||||
"file": "assets/forum-DYii3E-X.js",
|
"file": "assets/forum-DckUD3iN.js",
|
||||||
"name": "forum",
|
"name": "forum",
|
||||||
"src": "resources/forum/livewire-tailwind/js/forum.js",
|
"src": "resources/forum/livewire-tailwind/js/forum.js",
|
||||||
"isEntry": true,
|
"isEntry": true,
|
||||||
"css": [
|
"css": [
|
||||||
"assets/forum-B-iLUX4_.css"
|
"assets/forum-qY4RLc9f.css"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"resources/js/app.js": {
|
"resources/js/app.js": {
|
||||||
"file": "assets/app-CEsE5a7F.js",
|
"file": "assets/app-Xaw6OIO1.js",
|
||||||
"name": "app",
|
"name": "app",
|
||||||
"src": "resources/js/app.js",
|
"src": "resources/js/app.js",
|
||||||
"isEntry": true
|
"isEntry": true
|
||||||
|
|||||||
Reference in New Issue
Block a user