refactor: reduce temporary variables passed to views

This commit is contained in:
Roardom
2023-06-19 21:17:10 +00:00
parent 1fa4a3e506
commit d2e36c368e
70 changed files with 1179 additions and 1321 deletions
+7 -17
View File
@@ -34,16 +34,11 @@ class RssController extends Controller
*/
public function index(Request $request, $hash = null): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
{
$user = $request->user();
$publicRss = Rss::where('is_private', '=', 0)->oldest('position')->get();
$privateRss = Rss::where('is_private', '=', 1)->where('user_id', '=', $user->id)->latest()->get();
return view('rss.index', [
'hash' => $hash,
'public_rss' => $publicRss,
'private_rss' => $privateRss,
'user' => $user,
'public_rss' => Rss::where('is_private', '=', 0)->oldest('position')->get(),
'private_rss' => Rss::where('is_private', '=', 1)->where('user_id', '=', $request->user()->id)->latest()->get(),
'user' => $request->user(),
]);
}
@@ -52,14 +47,12 @@ class RssController extends Controller
*/
public function create(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
{
$user = $request->user();
return view('rss.create', [
'categories' => Category::select(['id', 'name', 'position'])->orderBy('position')->get(),
'types' => Type::select(['id', 'name', 'position'])->orderBy('position')->get(),
'resolutions' => Resolution::select(['id', 'name', 'position'])->orderBy('position')->get(),
'genres' => Genre::orderBy('name')->get(),
'user' => $user,
'user' => $request->user(),
]);
}
@@ -68,8 +61,6 @@ class RssController extends Controller
*/
public function store(Request $request): \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
{
$user = $request->user();
$v = validator($request->all(), [
'name' => 'required|min:3|max:255',
'search' => 'max:255',
@@ -113,13 +104,12 @@ class RssController extends Controller
'dead',
]);
$error = null;
$success = null;
if ($v->passes()) {
$rss = new Rss();
$rss->name = $request->input('name');
$rss->user_id = $user->id;
$rss->user_id = $request->user()->id;
$expected = $rss->expected_fields;
$rss->json_torrent = array_merge($expected, $params);
$rss->is_private = 1;
@@ -212,6 +202,7 @@ class RssController extends Controller
{
$user = $request->user();
$rss = Rss::where('is_private', '=', 1)->findOrFail($id);
abort_unless($user->group->is_modo || $user->id === $rss->user_id, 403);
return view('rss.edit', [
@@ -272,9 +263,8 @@ class RssController extends Controller
'dead',
]);
$error = null;
$success = null;
$redirect = null;
if ($v->passes()) {
$expected = $rss->expected_fields;
$push = array_merge($expected, $params);