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

Leverage injected request object

Browse Source 
Laravel automatically injects the current Http [request object][1] to all Controller actions and Middleware. Leveraging this object improves consistency and testability.

[1]: https://laravel.com/docs/5.7/requests#accessing-the-request
This commit is contained in:
Laravel Shift
2019-05-09 00:05:13 +00:00
parent b0732954c4
commit 97e88dd68b
48 changed files with 393 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TorrentController.php
+46 -46
View File
@@ -71,9 +71,9 @@ class TorrentController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function torrents()
public function torrents(Request $request)
{
$user = auth()->user();
$user = $request->user();
$personal_freeleech = PersonalFreeleech::where('user_id', '=', $user->id)->first();
$torrents = Torrent::with(['user', 'category'])->withCount(['thanks', 'comments'])->orderBy('sticky', 'desc')->orderBy('created_at', 'desc')->paginate(25);
$repository = $this->faceted;
@@ -96,9 +96,9 @@ class TorrentController extends Controller
* @param $tmdb
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function similar($category_id, $tmdb)
public function similar(Request $request, $category_id, $tmdb)
{
$user = auth()->user();
$user = $request->user();
$personal_freeleech = PersonalFreeleech::where('user_id', '=', $user->id)->first();
$torrents = Torrent::with(['user', 'category'])
->withCount(['thanks', 'comments'])
@@ -126,9 +126,9 @@ class TorrentController extends Controller
* @throws \ErrorException
* @throws \HttpInvalidParamException
*/
public function cardLayout()
public function cardLayout(Request $request)
{
$user = auth()->user();
$user = $request->user();
$torrents = Torrent::with(['user', 'category'])->latest()->paginate(33);
$repository = $this->faceted;
@@ -168,7 +168,7 @@ class TorrentController extends Controller
*/
public function filtered(Request $request)
{
$user = auth()->user();
$user = $request->user();
if ($user) {
if ($request->has('force')) {
if ($request->input('force') == 1) {
@@ -189,9 +189,9 @@ class TorrentController extends Controller
* @throws \ErrorException
* @throws \HttpInvalidParamException
*/
public function groupingLayout()
public function groupingLayout(Request $request)
{
$user = auth()->user();
$user = $request->user();
$repository = $this->faceted;
$personal_freeleech = PersonalFreeleech::where('user_id', '=', $user->id)->first();
@@ -319,7 +319,7 @@ class TorrentController extends Controller
*/
public function faceted(Request $request, Torrent $torrent)
{
$user = auth()->user();
$user = $request->user();
$repository = $this->faceted;
$personal_freeleech = PersonalFreeleech::where('user_id', '=', $user->id)->first();
$collection = null;
@@ -843,16 +843,16 @@ class TorrentController extends Controller
* @throws \ErrorException
* @throws \HttpInvalidParamException
*/
public function torrent($slug, $id)
public function torrent(Request $request, $slug, $id)
{
$torrent = Torrent::withAnyStatus()->with('comments')->findOrFail($id);
$uploader = $torrent->user;
$user = auth()->user();
$user = $request->user();
$freeleech_token = FreeleechToken::where('user_id', '=', $user->id)->where('torrent_id', '=', $torrent->id)->first();
$personal_freeleech = PersonalFreeleech::where('user_id', '=', $user->id)->first();
$comments = $torrent->comments()->latest()->paginate(5);
$total_tips = BonTransactions::where('torrent_id', '=', $id)->sum('cost');
$user_tips = BonTransactions::where('torrent_id', '=', $id)->where('sender', '=', auth()->user()->id)->sum('cost');
$user_tips = BonTransactions::where('torrent_id', '=', $id)->where('sender', '=', $request->user()->id)->sum('cost');
$last_seed_activity = History::where('info_hash', '=', $torrent->info_hash)->where('seeder', '=', 1)->latest('updated_at')->first();
$client = new \App\Services\MovieScrapper(config('api-keys.tmdb'), config('api-keys.tvdb'), config('api-keys.omdb'));
@@ -945,9 +945,9 @@ class TorrentController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function editForm($slug, $id)
public function editForm(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
$torrent = Torrent::withAnyStatus()->findOrFail($id);
abort_unless($user->group->is_modo || $user->id == $torrent->user_id, 403);
@@ -970,7 +970,7 @@ class TorrentController extends Controller
*/
public function edit(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
$torrent = Torrent::withAnyStatus()->findOrFail($id);
$client = new \App\Services\MovieScrapper(config('api-keys.tmdb'), config('api-keys.tvdb'), config('api-keys.omdb'));
@@ -1067,7 +1067,7 @@ class TorrentController extends Controller
]);
if ($v) {
$user = auth()->user();
$user = $request->user();
$id = $request->id;
$torrent = Torrent::withAnyStatus()->findOrFail($id);
@@ -1171,9 +1171,9 @@ class TorrentController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function uploadForm($title = '', $imdb = 0, $tmdb = 0)
public function uploadForm(Request $request, $title = '', $imdb = 0, $tmdb = 0)
{
$user = auth()->user();
$user = $request->user();
return view('torrent.upload', [
'categories' => Category::all()->sortBy('position'),
@@ -1196,7 +1196,7 @@ class TorrentController extends Controller
*/
public function upload(Request $request)
{
$user = auth()->user();
$user = $request->user();
$client = new \App\Services\MovieScrapper(config('api-keys.tmdb'), config('api-keys.tvdb'), config('api-keys.omdb'));
$requestFile = $request->file('torrent');
@@ -1361,10 +1361,10 @@ class TorrentController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function downloadCheck($slug, $id)
public function downloadCheck(Request $request, $slug, $id)
{
$torrent = Torrent::withAnyStatus()->findOrFail($id);
$user = auth()->user();
$user = $request->user();
return view('torrent.download_check', ['torrent' => $torrent, 'user' => $user]);
}
@@ -1378,9 +1378,9 @@ class TorrentController extends Controller
*
* @return TorrentFile
*/
public function download($slug, $id, $rsskey = null)
public function download(Request $request, $slug, $id, $rsskey = null)
{
$user = auth()->user();
$user = $request->user();
if (! $user && $rsskey) {
$user = User::where('rsskey', '=', $rsskey)->firstOrFail();
}
@@ -1420,7 +1420,7 @@ class TorrentController extends Controller
}
// Get the content of the torrent
$dict = Bencode::bdecode(file_get_contents(getcwd().'/files/torrents/'.$torrent->file_name));
if (auth()->check() || ($rsskey && $user)) {
if ($request->user() || ($rsskey && $user)) {
// Set the announce key and add the user passkey
$dict['announce'] = route('announce', ['passkey' => $user->passkey]);
// Remove Other announce url
@@ -1443,9 +1443,9 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function bumpTorrent($slug, $id)
public function bumpTorrent(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
abort_unless($user->group->is_modo || $user->group->is_internal, 403);
$torrent = Torrent::withAnyStatus()->findOrFail($id);
@@ -1483,15 +1483,15 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function bookmark($id)
public function bookmark(Request $request, $id)
{
$torrent = Torrent::withAnyStatus()->findOrFail($id);
if (auth()->user()->isBookmarked($torrent->id)) {
if ($request->user()->isBookmarked($torrent->id)) {
return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])
->withErrors('Torrent has already been bookmarked.');
} else {
auth()->user()->bookmarks()->attach($torrent->id);
$request->user()->bookmarks()->attach($torrent->id);
return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])
->withSuccess('Torrent Has Been Bookmarked Successfully!');
@@ -1505,10 +1505,10 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function unBookmark($id)
public function unBookmark(Request $request, $id)
{
$torrent = Torrent::withAnyStatus()->findOrFail($id);
auth()->user()->bookmarks()->detach($torrent->id);
$request->user()->bookmarks()->detach($torrent->id);
return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])
->withSuccess('Torrent Has Been Unbookmarked Successfully!');
@@ -1522,9 +1522,9 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function sticky($slug, $id)
public function sticky(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
abort_unless($user->group->is_modo || $user->group->is_internal, 403);
$torrent = Torrent::withAnyStatus()->findOrFail($id);
@@ -1536,7 +1536,7 @@ class TorrentController extends Controller
$torrent->save();
// Activity Log
\LogActivity::addToLog('Staff Member '.auth()->user()->username." has stickied torrent, ID: {$torrent->id} NAME: {$torrent->name} .");
\LogActivity::addToLog('Staff Member '.$request->user()->username." has stickied torrent, ID: {$torrent->id} NAME: {$torrent->name} .");
return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])
->withSuccess('Torrent Sticky Status Has Been Adjusted!');
@@ -1550,9 +1550,9 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function grantFL($slug, $id)
public function grantFL(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
abort_unless($user->group->is_modo || $user->group->is_internal, 403);
$torrent = Torrent::withAnyStatus()->findOrFail($id);
@@ -1589,9 +1589,9 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function grantFeatured($slug, $id)
public function grantFeatured(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
abort_unless($user->group->is_modo || $user->group->is_internal, 403);
$torrent = Torrent::withAnyStatus()->findOrFail($id);
@@ -1614,7 +1614,7 @@ class TorrentController extends Controller
);
// Activity Log
\LogActivity::addToLog('Staff Member '.auth()->user()->username." has featured torrent, ID: {$torrent->id} NAME: {$torrent->name} .");
\LogActivity::addToLog('Staff Member '.$request->user()->username." has featured torrent, ID: {$torrent->id} NAME: {$torrent->name} .");
return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])
->withSuccess('Torrent Is Now Featured!');
@@ -1632,9 +1632,9 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function grantDoubleUp($slug, $id)
public function grantDoubleUp(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
abort_unless($user->group->is_modo || $user->group->is_internal, 403);
$torrent = Torrent::withAnyStatus()->findOrFail($id);
@@ -1669,10 +1669,10 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function reseedTorrent($slug, $id)
public function reseedTorrent(Request $request, $slug, $id)
{
$appurl = config('app.url');
$user = auth()->user();
$user = $request->user();
$torrent = Torrent::findOrFail($id);
$reseed = History::where('info_hash', '=', $torrent->info_hash)->where('active', '=', 0)->get();
@@ -1708,9 +1708,9 @@ class TorrentController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function freeleechToken($slug, $id)
public function freeleechToken(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
$torrent = Torrent::withAnyStatus()->findOrFail($id);
$active_token = FreeleechToken::where('user_id', '=', $user->id)->where('torrent_id', '=', $torrent->id)->first();