Skip to content

Commit 7f8b99a

Browse files
HDVinnieHDVinnie
authored
Merge pull request #4448 from Roardom/refactor-with-success-warning-info
2 parents 64d08ec + 868ad35 commit 7f8b99a

File tree

99 files changed

+239
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+239
-239
lines changed

‎app/Http/Controllers/ApprovedRequestFillController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function store(Request $request, TorrentRequest $torrentRequest): \Illumi
7979
}
8080

8181
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
82-
->withSuccess(\sprintf(trans('request.approved-user'), $torrentRequest->name, $torrentRequest->filled_anon ? 'Anonymous' : $filler->username));
82+
->with('success', \sprintf(trans('request.approved-user'), $torrentRequest->name, $torrentRequest->filled_anon ? 'Anonymous' : $filler->username));
8383
}
8484

8585
/**
@@ -102,6 +102,6 @@ public function destroy(Request $request, TorrentRequest $torrentRequest): \Illu
102102
$filler->decrement('seedbonus', (float) $refunded);
103103

104104
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
105-
->withSuccess(trans('request.request-reset'));
105+
->with('success', trans('request.request-reset'));
106106
}
107107
}

‎app/Http/Controllers/Auth/ApplicationController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ public function store(StoreApplicationRequest $request): \Illuminate\Http\Redire
4545
$application->urlProofs()->createMany($request->validated('links'));
4646

4747
return to_route('login')
48-
->withSuccess(trans('auth.application-submitted'));
48+
->with('success', trans('auth.application-submitted'));
4949
}
5050
}

‎app/Http/Controllers/BountyController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function store(StoreTorrentRequestBountyRequest $request, TorrentRequest
8383
}
8484

8585
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
86-
->withSuccess(trans('request.added-bonus'));
86+
->with('success', trans('request.added-bonus'));
8787
}
8888

8989
public function update(UpdateTorrentRequestBountyRequest $request, TorrentRequest $torrentRequest, TorrentRequestBounty $torrentRequestBounty): \Illuminate\Http\RedirectResponse

‎app/Http/Controllers/ClaimController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function store(StoreTorrentRequestClaimRequest $request, TorrentRequest $
5252
}
5353

5454
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
55-
->withSuccess(trans('request.claimed-success'));
55+
->with('success', trans('request.claimed-success'));
5656
}
5757

5858
/**
@@ -78,6 +78,6 @@ public function destroy(Request $request, TorrentRequest $torrentRequest, Torren
7878
}
7979

8080
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
81-
->withSuccess(trans('request.unclaimed-success'));
81+
->with('success', trans('request.unclaimed-success'));
8282
}
8383
}

‎app/Http/Controllers/ClaimedPrizeController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function store(Request $request, Event $event): \Illuminate\Http\Redirect
8686
'fl_tokens' => $fl_tokens_won,
8787
]);
8888

89-
return to_route('events.show', ['event' => $event])->withSuccess('Congrats! You have won a prize!');
89+
return to_route('events.show', ['event' => $event])->with('success', 'Congrats! You have won a prize!');
9090
});
9191
}
9292
}

‎app/Http/Controllers/ContactController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse
4545
Mail::to($user->email)->send(new Contact($request->string('email')));
4646

4747
return to_route('home.index')
48-
->withSuccess('Your Message Was Successfully Sent');
48+
->with('success', 'Your Message Was Successfully Sent');
4949
}
5050
}

‎app/Http/Controllers/DonationController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ public function store(StoreDonationRequest $request)
4747
]);
4848

4949
return redirect()->route('donations.index')
50-
->withSuccess('Thank You For Supporting Us! Please allow for up to 48 hours for staff to confirm the transaction.');
50+
->with('success', 'Thank You For Supporting Us! Please allow for up to 48 hours for staff to confirm the transaction.');
5151
}
5252
}

‎app/Http/Controllers/PlaylistController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function store(StorePlaylistRequest $request): \Illuminate\Http\RedirectR
8686
}
8787

8888
return to_route('playlists.show', ['playlist' => $playlist])
89-
->withSuccess(trans('playlist.published-success'));
89+
->with('success', trans('playlist.published-success'));
9090
}
9191

9292
/**
@@ -162,7 +162,7 @@ public function update(UpdatePlaylistRequest $request, Playlist $playlist): \Ill
162162
}
163163

164164
return to_route('playlists.show', ['playlist' => $playlist])
165-
->withSuccess(trans('playlist.update-success'));
165+
->with('success', trans('playlist.update-success'));
166166
}
167167

168168
/**
@@ -179,6 +179,6 @@ public function destroy(Request $request, Playlist $playlist): \Illuminate\Http\
179179
$playlist->delete();
180180

181181
return to_route('playlists.index')
182-
->withSuccess(trans('playlist.deleted'));
182+
->with('success', trans('playlist.deleted'));
183183
}
184184
}

‎app/Http/Controllers/PlaylistTorrentController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function store(StorePlaylistTorrentRequest $request): \Illuminate\Http\Re
4444
$playlistTorrent->torrent()->searchable();
4545

4646
return to_route('playlists.show', ['playlist' => $playlist])
47-
->withSuccess(trans('playlist.attached-success'));
47+
->with('success', trans('playlist.attached-success'));
4848
}
4949

5050
/**
@@ -74,7 +74,7 @@ public function massUpsert(MassUpsertPlaylistTorrentRequest $request): \Illumina
7474
$playlist->torrents()->searchable();
7575

7676
return to_route('playlists.show', ['playlist' => $playlist])
77-
->withSuccess(trans('playlist.attached-success'));
77+
->with('success', trans('playlist.attached-success'));
7878
}
7979

8080
/**
@@ -91,6 +91,6 @@ public function destroy(Request $request, PlaylistTorrent $playlistTorrent): \Il
9191
$playlistTorrent->torrent()->searchable();
9292

9393
return to_route('playlists.show', ['playlist' => $playlistTorrent->playlist])
94-
->withSuccess(trans('playlist.detached-success'));
94+
->with('success', trans('playlist.detached-success'));
9595
}
9696
}

‎app/Http/Controllers/PollVoteController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function store(StorePollVoteRequest $request, Poll $poll): \Illuminate\Ht
5353
);
5454

5555
return to_route('polls.votes.index', ['poll' => $poll])
56-
->withSuccess(trans('poll.vote-counted'));
56+
->with('success', trans('poll.vote-counted'));
5757
}
5858

5959
/**

‎app/Http/Controllers/PostController.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse
162162
Notification::send($users, new NewPostTag($post));
163163

164164
return redirect()->to($realUrl)
165-
->withSuccess(trans('forum.reply-topic-success'));
165+
->with('success', trans('forum.reply-topic-success'));
166166
}
167167

168168
/**
@@ -211,7 +211,7 @@ public function update(Request $request, int $id): \Illuminate\Http\RedirectResp
211211
]);
212212

213213
return redirect()->to($postUrl)
214-
->withSuccess(trans('forum.edit-post-success'));
214+
->with('success', trans('forum.edit-post-success'));
215215
}
216216

217217
/**
@@ -262,10 +262,10 @@ public function destroy(Request $request, int $id): \Illuminate\Http\RedirectRes
262262

263263
if ($isTopicDeleted === true) {
264264
return to_route('forums.show', ['id' => $forum->id])
265-
->withSuccess(trans('forum.delete-post-success'));
265+
->with('success', trans('forum.delete-post-success'));
266266
}
267267

268268
return to_route('topics.show', ['id' => $post->topic->id])
269-
->withSuccess(trans('forum.delete-post-success'));
269+
->with('success', trans('forum.delete-post-success'));
270270
}
271271
}

‎app/Http/Controllers/ReportController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function request(Request $request, int $id): \Illuminate\Http\RedirectRes
5555
]);
5656

5757
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
58-
->withSuccess(trans('user.report-sent'));
58+
->with('success', trans('user.report-sent'));
5959
}
6060

6161
/**
@@ -86,7 +86,7 @@ public function torrent(Request $request, int $id): \Illuminate\Http\RedirectRes
8686
]);
8787

8888
return to_route('torrents.show', ['id' => $id])
89-
->withSuccess(trans('user.report-sent'));
89+
->with('success', trans('user.report-sent'));
9090
}
9191

9292
/**
@@ -116,6 +116,6 @@ public function user(Request $request, string $username): \Illuminate\Http\Redir
116116
]);
117117

118118
return to_route('users.show', ['user' => $reportedUser])
119-
->withSuccess(trans('user.report-sent'));
119+
->with('success', trans('user.report-sent'));
120120
}
121121
}

‎app/Http/Controllers/RequestController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public function store(StoreTorrentRequestRequest $request): \Illuminate\Http\Red
173173
}
174174

175175
return to_route('requests.index')
176-
->withSuccess(trans('request.added-request'));
176+
->with('success', trans('request.added-request'));
177177
}
178178

179179
/**
@@ -229,7 +229,7 @@ public function update(UpdateTorrentRequestRequest $request, TorrentRequest $tor
229229
}
230230

231231
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
232-
->withSuccess(trans('request.edited-request'));
232+
->with('success', trans('request.edited-request'));
233233
}
234234

235235
/**
@@ -259,6 +259,6 @@ public function destroy(Request $request, TorrentRequest $torrentRequest): \Illu
259259
$torrentRequest->delete();
260260

261261
return to_route('requests.index')
262-
->withSuccess(\sprintf(trans('request.deleted'), $torrentRequest->name));
262+
->with('success', \sprintf(trans('request.deleted'), $torrentRequest->name));
263263
}
264264
}

‎app/Http/Controllers/RequestFillController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function store(StoreRequestFillRequest $request, TorrentRequest $torrentR
5757
}
5858

5959
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
60-
->withSuccess(trans('request.pending-approval'));
60+
->with('success', trans('request.pending-approval'));
6161
}
6262

6363
/**
@@ -82,6 +82,6 @@ public function destroy(Request $request, TorrentRequest $torrentRequest): \Illu
8282
}
8383

8484
return to_route('requests.show', ['torrentRequest' => $torrentRequest])
85-
->withSuccess(trans('request.request-reset'));
85+
->with('success', trans('request.request-reset'));
8686
}
8787
}

‎app/Http/Controllers/ReseedController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function store(Request $request, int $id): \Illuminate\Http\RedirectRespo
5555
);
5656

5757
return to_route('torrents.show', ['id' => $torrent->id])
58-
->withSuccess('A notification has been sent to all users that downloaded this torrent along with original uploader!');
58+
->with('success', 'A notification has been sent to all users that downloaded this torrent along with original uploader!');
5959
}
6060

6161
return to_route('torrents.show', ['id' => $torrent->id])

‎app/Http/Controllers/RssController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse|\Illu
119119
$rss->save();
120120

121121
return to_route('rss.index', ['hash' => 'private'])
122-
->withSuccess(trans('rss.created'));
122+
->with('success', trans('rss.created'));
123123
}
124124

125125
return to_route('rss.create')
@@ -290,7 +290,7 @@ public function update(Request $request, int $id): \Illuminate\Http\RedirectResp
290290
$rss->save();
291291

292292
return to_route('rss.index', ['hash' => 'private'])
293-
->withSuccess(trans('rss.created'));
293+
->with('success', trans('rss.created'));
294294
}
295295

296296
return to_route('rss.create', ['id' => $id])
@@ -312,6 +312,6 @@ public function destroy(Request $request, int $id): \Illuminate\Http\RedirectRes
312312
$rss->delete();
313313

314314
return to_route('rss.index', ['hash' => 'private'])
315-
->withSuccess(trans('rss.deleted'));
315+
->with('success', trans('rss.deleted'));
316316
}
317317
}

‎app/Http/Controllers/SimilarTorrentController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,6 @@ public function update(Request $request, Category $category, int $tmdbId): \Illu
156156
break;
157157
}
158158

159-
return back()->withSuccess('Metadata update queued successfully.');
159+
return back()->with('success', 'Metadata update queued successfully.');
160160
}
161161
}

‎app/Http/Controllers/Staff/ApplicationController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function approve(ApproveApplicationRequest $request, int $id): \Illuminat
7676
Mail::to($application->email)->send(new InviteUser($invite));
7777

7878
return to_route('staff.applications.index')
79-
->withSuccess('Application Approved');
79+
->with('success', 'Application Approved');
8080
}
8181

8282
/**
@@ -94,6 +94,6 @@ public function reject(RejectApplicationRequest $request, int $id): \Illuminate\
9494
Mail::to($application->email)->send(new DenyApplication($request->deny));
9595

9696
return to_route('staff.applications.index')
97-
->withSuccess('Application Rejected');
97+
->with('success', 'Application Rejected');
9898
}
9999
}

‎app/Http/Controllers/Staff/ArticleController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function store(StoreArticleRequest $request): \Illuminate\Http\RedirectRe
6767
Article::create(['user_id' => $request->user()->id, 'image' => $filename ?? null] + $request->validated());
6868

6969
return to_route('staff.articles.index')
70-
->withSuccess('Your article has successfully published!');
70+
->with('success', 'Your article has successfully published!');
7171
}
7272

7373
/**
@@ -98,7 +98,7 @@ public function update(UpdateArticleRequest $request, Article $article): \Illumi
9898
$article->update(['image' => $filename ?? null,] + $request->validated());
9999

100100
return to_route('staff.articles.index')
101-
->withSuccess('Your article changes have successfully published!');
101+
->with('success', 'Your article changes have successfully published!');
102102
}
103103

104104
/**
@@ -112,6 +112,6 @@ public function destroy(Article $article): \Illuminate\Http\RedirectResponse
112112
$article->delete();
113113

114114
return to_route('staff.articles.index')
115-
->withSuccess('Article has successfully been deleted');
115+
->with('success', 'Article has successfully been deleted');
116116
}
117117
}

‎app/Http/Controllers/Staff/AuditController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ public function destroy(Audit $audit): \Illuminate\Http\RedirectResponse
5858
$audit->delete();
5959

6060
return to_route('staff.audits.index')
61-
->withSuccess('Audit Record Has Successfully Been Deleted');
61+
->with('success', 'Audit Record Has Successfully Been Deleted');
6262
}
6363
}

‎app/Http/Controllers/Staff/AutomaticTorrentFreeleechController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function store(StoreAutomaticTorrentFreeleechRequest $request): \Illumina
4747
AutomaticTorrentFreeleech::create($request->validated());
4848

4949
return to_route('staff.automatic_torrent_freeleeches.index')
50-
->withSuccess('Resolution Successfully Added');
50+
->with('success', 'Resolution Successfully Added');
5151
}
5252

5353
public function edit(AutomaticTorrentFreeleech $automaticTorrentFreeleech): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
@@ -65,14 +65,14 @@ public function update(UpdateAutomaticTorrentFreeleechRequest $request, Automati
6565
$automaticTorrentFreeleech->update($request->validated());
6666

6767
return to_route('staff.automatic_torrent_freeleeches.index')
68-
->withSuccess('Resolution Successfully Modified');
68+
->with('success', 'Resolution Successfully Modified');
6969
}
7070

7171
public function destroy(AutomaticTorrentFreeleech $automaticTorrentFreeleech): \Illuminate\Http\RedirectResponse
7272
{
7373
$automaticTorrentFreeleech->delete();
7474

7575
return to_route('staff.automatic_torrent_freeleeches.index')
76-
->withSuccess('Resolution Successfully Deleted');
76+
->with('success', 'Resolution Successfully Deleted');
7777
}
7878
}

‎app/Http/Controllers/Staff/BanController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ public function store(StoreBanRequest $request): \Illuminate\Http\RedirectRespon
6767
$user->notify(new UserBan($ban));
6868

6969
return to_route('users.show', ['user' => $user])
70-
->withSuccess('User Is Now Banned!');
70+
->with('success', 'User Is Now Banned!');
7171
}
7272
}

‎app/Http/Controllers/Staff/BlacklistClientController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function update(UpdateBlacklistClientRequest $request, BlacklistClient $b
6464
cache()->forget('client_blacklist');
6565

6666
return to_route('staff.blacklisted_clients.index')
67-
->withSuccess('Blacklisted Client Was Updated Successfully!');
67+
->with('success', 'Blacklisted Client Was Updated Successfully!');
6868
}
6969

7070
/**
@@ -90,7 +90,7 @@ public function store(StoreBlacklistClientRequest $request): \Illuminate\Http\Re
9090
cache()->forget('client_blacklist');
9191

9292
return to_route('staff.blacklisted_clients.index')
93-
->withSuccess('Blacklisted Client Stored Successfully!');
93+
->with('success', 'Blacklisted Client Stored Successfully!');
9494
}
9595

9696
/**
@@ -105,6 +105,6 @@ public function destroy(BlacklistClient $blacklistClient): \Illuminate\Http\Redi
105105
cache()->forget('client_blacklist');
106106

107107
return to_route('staff.blacklisted_clients.index')
108-
->withSuccess('Blacklisted Client Destroyed Successfully!');
108+
->with('success', 'Blacklisted Client Destroyed Successfully!');
109109
}
110110
}

0 commit comments

Comments
 (0)