mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-05-03 08:50:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.x.x' into Refund-System

Browse Source
This commit is contained in:
HDVinnie
2023-05-20 11:06:12 -04:00
committed by GitHub
parent 62642a5bc9 74485098f7
commit 4aa67fe22a
343 changed files with 7924 additions and 16917 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TorrentController.php
+11 -26
View File
@@ -13,9 +13,7 @@
namespace App\Http\Controllers;
use App\Helpers\Bbcode;
use App\Helpers\Bencode;
use App\Helpers\Linkify;
use App\Helpers\MediaInfo;
use App\Helpers\TorrentHelper;
use App\Helpers\TorrentTools;
@@ -41,10 +39,11 @@ use App\Models\Type;
use App\Models\Warning;
use App\Repositories\ChatRepository;
use App\Services\Tmdb\TMDBScraper;
use hdvinnie\LaravelJoyPixels\LaravelJoyPixels;
use App\Services\Unit3dAnnounce;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Redis;
use Intervention\Image\Facades\Image;
use MarcReichel\IGDBLaravel\Models\Game;
use MarcReichel\IGDBLaravel\Models\PlatformLogo;
@@ -69,7 +68,7 @@ class TorrentController extends Controller
*/
public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
{
return view('torrent.torrents');
return view('torrent.index');
}
/**
@@ -145,7 +144,7 @@ class TorrentController extends Controller
$playlists = $user->playlists;
return view('torrent.torrent', [
return view('torrent.show', [
'torrent' => $torrent,
'user' => $user,
'personal_freeleech' => $personalFreeleech,
@@ -188,7 +187,7 @@ class TorrentController extends Controller
abort_unless($user->group->is_modo || $user->id === $torrent->user_id, 403);
return view('torrent.edit_torrent', [
return view('torrent.edit', [
'categories' => $categories,
'types' => $types,
'resolutions' => Resolution::all()->sortBy('position'),
@@ -373,6 +372,11 @@ class TorrentController extends Controller
FeaturedTorrent::where('torrent_id', '=', $id)->delete();
}
$cacheKey = config('cache.prefix').'torrents:infohash2id';
Redis::connection('cache')->command('HDEL', [$cacheKey, $torrent->info_hash]);
Unit3dAnnounce::removeTorrent($torrent);
$torrent->delete();
return to_route('torrents')
@@ -413,7 +417,7 @@ class TorrentController extends Controller
$categories[(int) $cat->id] = $temp;
}
return view('torrent.upload', [
return view('torrent.create', [
'categories' => $categories,
'types' => Type::all()->sortBy('position'),
'resolutions' => Resolution::all()->sortBy('position'),
@@ -430,25 +434,6 @@ class TorrentController extends Controller
]);
}
/**
* Preview torrent description.
*/
public function preview(Request $request): \Illuminate\Http\JsonResponse
{
// Preview The Upload
$joyPixel = app()->make(LaravelJoyPixels::class);
$bbcode = new Bbcode();
$linkify = new Linkify();
$previewContent = $joyPixel->toImage(
$linkify->linky(
$bbcode->parse($request->input('description'))
)
);
return response()->json($previewContent);
}
/**
* Upload A Torrent.
*/