diff --git a/app/Livewire/Downloads.php b/app/Livewire/Downloads.php deleted file mode 100644 index 3cf1a8d..0000000 --- a/app/Livewire/Downloads.php +++ /dev/null @@ -1,60 +0,0 @@ - ['except' => '', 'as' => 's'], - 'withTorrents' => ['withTorrents' => '', 'as' => 'withTorrents'], - 'order' => ['except' => '', 'as' => 'order'], - ]; - - public function updatingSearch() - { - $this->resetPage(); - } - - public function render() - { - $orderby = 'slug'; - $orderdirection = 'desc'; - - switch ($this->order) { - case 'az': - $orderby = 'slug'; - $orderdirection = 'asc'; - break; - case 'za': - $orderby = 'slug'; - $orderdirection = 'desc'; - break; - default: - $orderby = 'created_at'; - $orderdirection = 'desc'; - } - - $hentai = Hentai::with('episodes') - ->when($this->search != '', fn ($query) => $query->whereHas('episodes', fn ($q) => $q->where('title', 'like', '%'.$this->search.'%')->orWhere('title_jpn', 'like', '%'.$this->search.'%'))) - ->when($this->withTorrents != '', fn ($query) => $query->whereHas('torrents')) - ->orderBy($orderby, $orderdirection) - ->paginate(10); - - return view('livewire.downloads', [ - 'hentai' => $hentai, - 'query' => $this->search, - ]); - } -} diff --git a/app/Livewire/DownloadsPatreon.php b/app/Livewire/DownloadsSearch.php similarity index 90% rename from app/Livewire/DownloadsPatreon.php rename to app/Livewire/DownloadsSearch.php index ed173eb..1a54313 100644 --- a/app/Livewire/DownloadsPatreon.php +++ b/app/Livewire/DownloadsSearch.php @@ -6,7 +6,7 @@ use App\Models\Downloads; use Livewire\Component; use Livewire\WithPagination; -class DownloadsPatreon extends Component +class DownloadsSearch extends Component { use WithPagination; @@ -72,12 +72,12 @@ class DownloadsPatreon extends Component } $downloads = Downloads::when($this->fileSearch != '', fn ($query) => $query->where('url', 'like', '%'.$this->fileSearch.'%')) - ->where('size', '>', 0) - ->where(fn ($q) => $q->where('type', '=', 'UHD')->orWhere('type', '=', 'UHDi')) + ->when(!auth()->user()->is_patreon, fn ($query) => $query->whereIn('type', ['FHD', 'FHDi'])) + ->whereNotNull('size') ->orderBy($orderby, $orderdirection) ->paginate(20); - return view('livewire.downloads-patreon', [ + return view('livewire.downloads-search', [ 'downloads' => $downloads, 'query' => $this->fileSearch, ]); diff --git a/resources/views/livewire/downloads-patreon.blade.php b/resources/views/livewire/downloads-search.blade.php similarity index 90% rename from resources/views/livewire/downloads-patreon.blade.php rename to resources/views/livewire/downloads-search.blade.php index 43936ec..242b352 100644 --- a/resources/views/livewire/downloads-patreon.blade.php +++ b/resources/views/livewire/downloads-search.blade.php @@ -73,6 +73,11 @@
Download
+ @php + $dldomains = config('hstream.download_domain'); + $dlpdomains = config('hstream.download_domain_4k'); + @endphp + @foreach ($downloads as $download) @php @@ -105,11 +110,14 @@
@php - $dlpdomains = config('hstream.download_domain_4k'); - $now = \Illuminate\Support\Carbon::now(); - $expire = \Illuminate\Support\Facades\Crypt::encryptString($now->addHours(6)); - $file = \Illuminate\Support\Facades\Crypt::encryptString('hentai/'.$download->url); - $downloadURL = $dlpdomains[array_rand($dlpdomains)].'/download/'.$file.'/'.$expire; + if (in_array($download->type, ['FHD', 'FHDi'])) { + $downloadURL = $dldomains[array_rand($dldomains)].'/'.$download->url; + } else { + $now = \Illuminate\Support\Carbon::now(); + $expire = \Illuminate\Support\Facades\Crypt::encryptString($now->addHours(6)); + $file = \Illuminate\Support\Facades\Crypt::encryptString('hentai/'.$download->url); + $downloadURL = $dlpdomains[array_rand($dlpdomains)].'/download/'.$file.'/'.$expire; + } @endphp
diff --git a/resources/views/search/download-patreon.blade.php b/resources/views/search/download-patreon.blade.php deleted file mode 100644 index cc4b3a7..0000000 --- a/resources/views/search/download-patreon.blade.php +++ /dev/null @@ -1,4 +0,0 @@ - - @include('user.partials.background') - @livewire('downloads-patreon') - diff --git a/resources/views/search/download.blade.php b/resources/views/search/download.blade.php index 40d239a..1d957bb 100644 --- a/resources/views/search/download.blade.php +++ b/resources/views/search/download.blade.php @@ -1,3 +1,4 @@ - @livewire('downloads') + @include('user.partials.background') + @livewire('downloads-search') diff --git a/routes/web.php b/routes/web.php index e08acd6..186696e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -78,9 +78,6 @@ Route::middleware('auth')->group(function () { // Download Page Route::get('/download-search', [HomeController::class, 'downloadSearch'])->name('download.search'); - - // Download Page for Patreon Subscribers - Route::get('/files', [DownloadsController::class, 'index'])->name('files.index'); }); Route::get('/user/{username}', [UserController::class, 'index'])->name('user.index');