Merge pull request #4448 from Roardom/refactor-with-success-warning-info

app/Http/Controllers/ApprovedRequestFillController.php

@@ -79,7 +79,7 @@ public function store(Request $request, TorrentRequest $torrentRequest): \Illumi
         }
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(\sprintf(trans('request.approved-user'), $torrentRequest->name, $torrentRequest->filled_anon ? 'Anonymous' : $filler->username));
+            ->with('success', \sprintf(trans('request.approved-user'), $torrentRequest->name, $torrentRequest->filled_anon ? 'Anonymous' : $filler->username));
     }
 
     /**
@@ -102,6 +102,6 @@ public function destroy(Request $request, TorrentRequest $torrentRequest): \Illu
         $filler->decrement('seedbonus', (float) $refunded);
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(trans('request.request-reset'));
+            ->with('success', trans('request.request-reset'));
     }
 }

app/Http/Controllers/Auth/ApplicationController.php

@@ -45,6 +45,6 @@ public function store(StoreApplicationRequest $request): \Illuminate\Http\Redire
         $application->urlProofs()->createMany($request->validated('links'));
 
         return to_route('login')
-            ->withSuccess(trans('auth.application-submitted'));
+            ->with('success', trans('auth.application-submitted'));
     }
 }

app/Http/Controllers/BountyController.php

@@ -83,7 +83,7 @@ public function store(StoreTorrentRequestBountyRequest $request, TorrentRequest
         }
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(trans('request.added-bonus'));
+            ->with('success', trans('request.added-bonus'));
     }
 
     public function update(UpdateTorrentRequestBountyRequest $request, TorrentRequest $torrentRequest, TorrentRequestBounty $torrentRequestBounty): \Illuminate\Http\RedirectResponse

app/Http/Controllers/ClaimController.php

@@ -52,7 +52,7 @@ public function store(StoreTorrentRequestClaimRequest $request, TorrentRequest $
         }
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(trans('request.claimed-success'));
+            ->with('success', trans('request.claimed-success'));
     }
 
     /**
@@ -78,6 +78,6 @@ public function destroy(Request $request, TorrentRequest $torrentRequest, Torren
         }
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(trans('request.unclaimed-success'));
+            ->with('success', trans('request.unclaimed-success'));
     }
 }

app/Http/Controllers/ClaimedPrizeController.php

@@ -86,7 +86,7 @@ public function store(Request $request, Event $event): \Illuminate\Http\Redirect
                 'fl_tokens' => $fl_tokens_won,
             ]);
 
-            return to_route('events.show', ['event' => $event])->withSuccess('Congrats! You have won a prize!');
+            return to_route('events.show', ['event' => $event])->with('success', 'Congrats! You have won a prize!');
         });
     }
 }

app/Http/Controllers/ContactController.php

@@ -45,6 +45,6 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse
         Mail::to($user->email)->send(new Contact($request->string('email')));
 
         return to_route('home.index')
-            ->withSuccess('Your Message Was Successfully Sent');
+            ->with('success', 'Your Message Was Successfully Sent');
     }
 }

app/Http/Controllers/DonationController.php

@@ -47,6 +47,6 @@ public function store(StoreDonationRequest $request)
         ]);
 
         return redirect()->route('donations.index')
-            ->withSuccess('Thank You For Supporting Us! Please allow for up to 48 hours for staff to confirm the transaction.');
+            ->with('success', 'Thank You For Supporting Us! Please allow for up to 48 hours for staff to confirm the transaction.');
     }
 }

app/Http/Controllers/PlaylistController.php

@@ -86,7 +86,7 @@ public function store(StorePlaylistRequest $request): \Illuminate\Http\RedirectR
         }
 
         return to_route('playlists.show', ['playlist' => $playlist])
-            ->withSuccess(trans('playlist.published-success'));
+            ->with('success', trans('playlist.published-success'));
     }
 
     /**
@@ -162,7 +162,7 @@ public function update(UpdatePlaylistRequest $request, Playlist $playlist): \Ill
         }
 
         return to_route('playlists.show', ['playlist' => $playlist])
-            ->withSuccess(trans('playlist.update-success'));
+            ->with('success', trans('playlist.update-success'));
     }
 
     /**
@@ -179,6 +179,6 @@ public function destroy(Request $request, Playlist $playlist): \Illuminate\Http\
         $playlist->delete();
 
         return to_route('playlists.index')
-            ->withSuccess(trans('playlist.deleted'));
+            ->with('success', trans('playlist.deleted'));
     }
 }

app/Http/Controllers/PlaylistTorrentController.php

@@ -44,7 +44,7 @@ public function store(StorePlaylistTorrentRequest $request): \Illuminate\Http\Re
         $playlistTorrent->torrent()->searchable();
 
         return to_route('playlists.show', ['playlist' => $playlist])
-            ->withSuccess(trans('playlist.attached-success'));
+            ->with('success', trans('playlist.attached-success'));
     }
 
     /**
@@ -74,7 +74,7 @@ public function massUpsert(MassUpsertPlaylistTorrentRequest $request): \Illumina
         $playlist->torrents()->searchable();
 
         return to_route('playlists.show', ['playlist' => $playlist])
-            ->withSuccess(trans('playlist.attached-success'));
+            ->with('success', trans('playlist.attached-success'));
     }
 
     /**
@@ -91,6 +91,6 @@ public function destroy(Request $request, PlaylistTorrent $playlistTorrent): \Il
         $playlistTorrent->torrent()->searchable();
 
         return to_route('playlists.show', ['playlist' => $playlistTorrent->playlist])
-            ->withSuccess(trans('playlist.detached-success'));
+            ->with('success', trans('playlist.detached-success'));
     }
 }

app/Http/Controllers/PollVoteController.php

@@ -53,7 +53,7 @@ public function store(StorePollVoteRequest $request, Poll $poll): \Illuminate\Ht
         );
 
         return to_route('polls.votes.index', ['poll' => $poll])
-            ->withSuccess(trans('poll.vote-counted'));
+            ->with('success', trans('poll.vote-counted'));
     }
 
     /**

app/Http/Controllers/PostController.php

@@ -162,7 +162,7 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse
         Notification::send($users, new NewPostTag($post));
 
         return redirect()->to($realUrl)
-            ->withSuccess(trans('forum.reply-topic-success'));
+            ->with('success', trans('forum.reply-topic-success'));
     }
 
     /**
@@ -211,7 +211,7 @@ public function update(Request $request, int $id): \Illuminate\Http\RedirectResp
         ]);
 
         return redirect()->to($postUrl)
-            ->withSuccess(trans('forum.edit-post-success'));
+            ->with('success', trans('forum.edit-post-success'));
     }
 
     /**
@@ -262,10 +262,10 @@ public function destroy(Request $request, int $id): \Illuminate\Http\RedirectRes
 
         if ($isTopicDeleted === true) {
             return to_route('forums.show', ['id' => $forum->id])
-                ->withSuccess(trans('forum.delete-post-success'));
+                ->with('success', trans('forum.delete-post-success'));
         }
 
         return to_route('topics.show', ['id' => $post->topic->id])
-            ->withSuccess(trans('forum.delete-post-success'));
+            ->with('success', trans('forum.delete-post-success'));
     }
 }

app/Http/Controllers/ReportController.php

@@ -55,7 +55,7 @@ public function request(Request $request, int $id): \Illuminate\Http\RedirectRes
         ]);
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(trans('user.report-sent'));
+            ->with('success', trans('user.report-sent'));
     }
 
     /**
@@ -86,7 +86,7 @@ public function torrent(Request $request, int $id): \Illuminate\Http\RedirectRes
         ]);
 
         return to_route('torrents.show', ['id' => $id])
-            ->withSuccess(trans('user.report-sent'));
+            ->with('success', trans('user.report-sent'));
     }
 
     /**
@@ -116,6 +116,6 @@ public function user(Request $request, string $username): \Illuminate\Http\Redir
         ]);
 
         return to_route('users.show', ['user' => $reportedUser])
-            ->withSuccess(trans('user.report-sent'));
+            ->with('success', trans('user.report-sent'));
     }
 }

app/Http/Controllers/RequestController.php

@@ -173,7 +173,7 @@ public function store(StoreTorrentRequestRequest $request): \Illuminate\Http\Red
         }
 
         return to_route('requests.index')
-            ->withSuccess(trans('request.added-request'));
+            ->with('success', trans('request.added-request'));
     }
 
     /**
@@ -229,7 +229,7 @@ public function update(UpdateTorrentRequestRequest $request, TorrentRequest $tor
         }
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(trans('request.edited-request'));
+            ->with('success', trans('request.edited-request'));
     }
 
     /**
@@ -259,6 +259,6 @@ public function destroy(Request $request, TorrentRequest $torrentRequest): \Illu
         $torrentRequest->delete();
 
         return to_route('requests.index')
-            ->withSuccess(\sprintf(trans('request.deleted'), $torrentRequest->name));
+            ->with('success', \sprintf(trans('request.deleted'), $torrentRequest->name));
     }
 }

app/Http/Controllers/RequestFillController.php

@@ -57,7 +57,7 @@ public function store(StoreRequestFillRequest $request, TorrentRequest $torrentR
         }
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(trans('request.pending-approval'));
+            ->with('success', trans('request.pending-approval'));
     }
 
     /**
@@ -82,6 +82,6 @@ public function destroy(Request $request, TorrentRequest $torrentRequest): \Illu
         }
 
         return to_route('requests.show', ['torrentRequest' => $torrentRequest])
-            ->withSuccess(trans('request.request-reset'));
+            ->with('success', trans('request.request-reset'));
     }
 }

app/Http/Controllers/ReseedController.php

@@ -55,7 +55,7 @@ public function store(Request $request, int $id): \Illuminate\Http\RedirectRespo
             );
 
             return to_route('torrents.show', ['id' => $torrent->id])
-                ->withSuccess('A notification has been sent to all users that downloaded this torrent along with original uploader!');
+                ->with('success', 'A notification has been sent to all users that downloaded this torrent along with original uploader!');
         }
 
         return to_route('torrents.show', ['id' => $torrent->id])

app/Http/Controllers/RssController.php

@@ -119,7 +119,7 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse|\Illu
             $rss->save();
 
             return to_route('rss.index', ['hash' => 'private'])
-                ->withSuccess(trans('rss.created'));
+                ->with('success', trans('rss.created'));
         }
 
         return to_route('rss.create')
@@ -290,7 +290,7 @@ public function update(Request $request, int $id): \Illuminate\Http\RedirectResp
             $rss->save();
 
             return to_route('rss.index', ['hash' => 'private'])
-                ->withSuccess(trans('rss.created'));
+                ->with('success', trans('rss.created'));
         }
 
         return to_route('rss.create', ['id' => $id])
@@ -312,6 +312,6 @@ public function destroy(Request $request, int $id): \Illuminate\Http\RedirectRes
         $rss->delete();
 
         return to_route('rss.index', ['hash' => 'private'])
-            ->withSuccess(trans('rss.deleted'));
+            ->with('success', trans('rss.deleted'));
     }
 }

app/Http/Controllers/SimilarTorrentController.php

@@ -156,6 +156,6 @@ public function update(Request $request, Category $category, int $tmdbId): \Illu
                 break;
         }
 
-        return back()->withSuccess('Metadata update queued successfully.');
+        return back()->with('success', 'Metadata update queued successfully.');
     }
 }

app/Http/Controllers/Staff/ApplicationController.php

@@ -76,7 +76,7 @@ public function approve(ApproveApplicationRequest $request, int $id): \Illuminat
         Mail::to($application->email)->send(new InviteUser($invite));
 
         return to_route('staff.applications.index')
-            ->withSuccess('Application Approved');
+            ->with('success', 'Application Approved');
     }
 
     /**
@@ -94,6 +94,6 @@ public function reject(RejectApplicationRequest $request, int $id): \Illuminate\
         Mail::to($application->email)->send(new DenyApplication($request->deny));
 
         return to_route('staff.applications.index')
-            ->withSuccess('Application Rejected');
+            ->with('success', 'Application Rejected');
     }
 }

app/Http/Controllers/Staff/ArticleController.php

@@ -67,7 +67,7 @@ public function store(StoreArticleRequest $request): \Illuminate\Http\RedirectRe
         Article::create(['user_id' => $request->user()->id, 'image' => $filename ?? null] + $request->validated());
 
         return to_route('staff.articles.index')
-            ->withSuccess('Your article has successfully published!');
+            ->with('success', 'Your article has successfully published!');
     }
 
     /**
@@ -98,7 +98,7 @@ public function update(UpdateArticleRequest $request, Article $article): \Illumi
         $article->update(['image' => $filename ?? null,] + $request->validated());
 
         return to_route('staff.articles.index')
-            ->withSuccess('Your article changes have successfully published!');
+            ->with('success', 'Your article changes have successfully published!');
     }
 
     /**
@@ -112,6 +112,6 @@ public function destroy(Article $article): \Illuminate\Http\RedirectResponse
         $article->delete();
 
         return to_route('staff.articles.index')
-            ->withSuccess('Article has successfully been deleted');
+            ->with('success', 'Article has successfully been deleted');
     }
 }

app/Http/Controllers/Staff/AuditController.php

@@ -58,6 +58,6 @@ public function destroy(Audit $audit): \Illuminate\Http\RedirectResponse
         $audit->delete();
 
         return to_route('staff.audits.index')
-            ->withSuccess('Audit Record Has Successfully Been Deleted');
+            ->with('success', 'Audit Record Has Successfully Been Deleted');
     }
 }

app/Http/Controllers/Staff/AutomaticTorrentFreeleechController.php

@@ -47,7 +47,7 @@ public function store(StoreAutomaticTorrentFreeleechRequest $request): \Illumina
         AutomaticTorrentFreeleech::create($request->validated());
 
         return to_route('staff.automatic_torrent_freeleeches.index')
-            ->withSuccess('Resolution Successfully Added');
+            ->with('success', 'Resolution Successfully Added');
     }
 
     public function edit(AutomaticTorrentFreeleech $automaticTorrentFreeleech): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
@@ -65,14 +65,14 @@ public function update(UpdateAutomaticTorrentFreeleechRequest $request, Automati
         $automaticTorrentFreeleech->update($request->validated());
 
         return to_route('staff.automatic_torrent_freeleeches.index')
-            ->withSuccess('Resolution Successfully Modified');
+            ->with('success', 'Resolution Successfully Modified');
     }
 
     public function destroy(AutomaticTorrentFreeleech $automaticTorrentFreeleech): \Illuminate\Http\RedirectResponse
     {
         $automaticTorrentFreeleech->delete();
 
         return to_route('staff.automatic_torrent_freeleeches.index')
-            ->withSuccess('Resolution Successfully Deleted');
+            ->with('success', 'Resolution Successfully Deleted');
     }
 }

app/Http/Controllers/Staff/BanController.php

@@ -67,6 +67,6 @@ public function store(StoreBanRequest $request): \Illuminate\Http\RedirectRespon
         $user->notify(new UserBan($ban));
 
         return to_route('users.show', ['user' => $user])
-            ->withSuccess('User Is Now Banned!');
+            ->with('success', 'User Is Now Banned!');
     }
 }

app/Http/Controllers/Staff/BlacklistClientController.php

@@ -64,7 +64,7 @@ public function update(UpdateBlacklistClientRequest $request, BlacklistClient $b
         cache()->forget('client_blacklist');
 
         return to_route('staff.blacklisted_clients.index')
-            ->withSuccess('Blacklisted Client Was Updated Successfully!');
+            ->with('success', 'Blacklisted Client Was Updated Successfully!');
     }
 
     /**
@@ -90,7 +90,7 @@ public function store(StoreBlacklistClientRequest $request): \Illuminate\Http\Re
         cache()->forget('client_blacklist');
 
         return to_route('staff.blacklisted_clients.index')
-            ->withSuccess('Blacklisted Client Stored Successfully!');
+            ->with('success', 'Blacklisted Client Stored Successfully!');
     }
 
     /**
@@ -105,6 +105,6 @@ public function destroy(BlacklistClient $blacklistClient): \Illuminate\Http\Redi
         cache()->forget('client_blacklist');
 
         return to_route('staff.blacklisted_clients.index')
-            ->withSuccess('Blacklisted Client Destroyed Successfully!');
+            ->with('success', 'Blacklisted Client Destroyed Successfully!');
     }
 }