diff --git a/app/Commands/AddTrackToPlaylistCommand.php b/app/Commands/AddTrackToPlaylistCommand.php
index 3d7c4bc4..a01e2e36 100644
--- a/app/Commands/AddTrackToPlaylistCommand.php
+++ b/app/Commands/AddTrackToPlaylistCommand.php
@@ -22,9 +22,9 @@ namespace App\Commands;
use App\Models\Playlist;
use App\Models\Track;
-use Auth;
-use DB;
-use Validator;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
class AddTrackToPlaylistCommand extends CommandBase
{
diff --git a/app/Commands/CreateAlbumCommand.php b/app/Commands/CreateAlbumCommand.php
index 39276a5c..913a91df 100644
--- a/app/Commands/CreateAlbumCommand.php
+++ b/app/Commands/CreateAlbumCommand.php
@@ -23,9 +23,9 @@ namespace App\Commands;
use App\Models\Album;
use App\Models\Image;
use App\Models\User;
-use Auth;
-use Gate;
-use Validator;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
class CreateAlbumCommand extends CommandBase
{
diff --git a/app/Commands/CreateAnnouncementCommand.php b/app/Commands/CreateAnnouncementCommand.php
index a2b9fbc9..f426a520 100644
--- a/app/Commands/CreateAnnouncementCommand.php
+++ b/app/Commands/CreateAnnouncementCommand.php
@@ -21,8 +21,8 @@
namespace App\Commands;
use App\Models\Announcement;
-use Gate;
-use Validator;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
class CreateAnnouncementCommand extends CommandBase
{
diff --git a/app/Commands/CreateCommentCommand.php b/app/Commands/CreateCommentCommand.php
index 6971f9e0..b40a7bf2 100644
--- a/app/Commands/CreateCommentCommand.php
+++ b/app/Commands/CreateCommentCommand.php
@@ -25,9 +25,9 @@ use App\Models\Comment;
use App\Models\Playlist;
use App\Models\Track;
use App\Models\User;
-use Auth;
-use Notification;
-use Validator;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Facades\Validator;
class CreateCommentCommand extends CommandBase
{
diff --git a/app/Commands/CreateGenreCommand.php b/app/Commands/CreateGenreCommand.php
index ac32e30f..a55641e5 100644
--- a/app/Commands/CreateGenreCommand.php
+++ b/app/Commands/CreateGenreCommand.php
@@ -21,9 +21,9 @@
namespace App\Commands;
use App\Models\Genre;
-use Gate;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
-use Validator;
class CreateGenreCommand extends CommandBase
{
diff --git a/app/Commands/CreatePlaylistCommand.php b/app/Commands/CreatePlaylistCommand.php
index 94dcac30..a406806e 100644
--- a/app/Commands/CreatePlaylistCommand.php
+++ b/app/Commands/CreatePlaylistCommand.php
@@ -21,9 +21,9 @@
namespace App\Commands;
use App\Models\Playlist;
-use Auth;
-use Notification;
-use Validator;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Facades\Validator;
class CreatePlaylistCommand extends CommandBase
{
diff --git a/app/Commands/CreateShowSongCommand.php b/app/Commands/CreateShowSongCommand.php
index 086940b6..1bae7551 100644
--- a/app/Commands/CreateShowSongCommand.php
+++ b/app/Commands/CreateShowSongCommand.php
@@ -21,9 +21,9 @@
namespace App\Commands;
use App\Models\ShowSong;
-use Gate;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
-use Validator;
class CreateShowSongCommand extends CommandBase
{
diff --git a/app/Commands/CreateUserCommand.php b/app/Commands/CreateUserCommand.php
index d1d91da9..f63072a1 100644
--- a/app/Commands/CreateUserCommand.php
+++ b/app/Commands/CreateUserCommand.php
@@ -21,8 +21,8 @@
namespace App\Commands;
use App\Models\User;
-use Gate;
-use Validator;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
class CreateUserCommand extends CommandBase
{
diff --git a/app/Commands/DeleteAlbumCommand.php b/app/Commands/DeleteAlbumCommand.php
index 6b4e6b46..2962767e 100644
--- a/app/Commands/DeleteAlbumCommand.php
+++ b/app/Commands/DeleteAlbumCommand.php
@@ -21,8 +21,8 @@
namespace App\Commands;
use App\Models\Album;
-use Auth;
-use Gate;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
class DeleteAlbumCommand extends CommandBase
{
diff --git a/app/Commands/DeleteGenreCommand.php b/app/Commands/DeleteGenreCommand.php
index a72e2065..61600869 100644
--- a/app/Commands/DeleteGenreCommand.php
+++ b/app/Commands/DeleteGenreCommand.php
@@ -22,9 +22,9 @@ namespace App\Commands;
use App\Jobs\DeleteGenre;
use App\Models\Genre;
-use Gate;
use Illuminate\Foundation\Bus\DispatchesJobs;
-use Validator;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
class DeleteGenreCommand extends CommandBase
{
diff --git a/app/Commands/DeletePlaylistCommand.php b/app/Commands/DeletePlaylistCommand.php
index 4da07676..8a4af391 100644
--- a/app/Commands/DeletePlaylistCommand.php
+++ b/app/Commands/DeletePlaylistCommand.php
@@ -21,7 +21,7 @@
namespace App\Commands;
use App\Models\Playlist;
-use Auth;
+use Illuminate\Support\Facades\Auth;
class DeletePlaylistCommand extends CommandBase
{
diff --git a/app/Commands/DeleteShowSongCommand.php b/app/Commands/DeleteShowSongCommand.php
index 54911c7b..576ce969 100644
--- a/app/Commands/DeleteShowSongCommand.php
+++ b/app/Commands/DeleteShowSongCommand.php
@@ -22,9 +22,9 @@ namespace App\Commands;
use App\Jobs\DeleteShowSong;
use App\Models\ShowSong;
-use Gate;
use Illuminate\Foundation\Bus\DispatchesJobs;
-use Validator;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
class DeleteShowSongCommand extends CommandBase
{
diff --git a/app/Commands/DeleteTrackCommand.php b/app/Commands/DeleteTrackCommand.php
index eac152b7..f561b06c 100644
--- a/app/Commands/DeleteTrackCommand.php
+++ b/app/Commands/DeleteTrackCommand.php
@@ -21,7 +21,7 @@
namespace App\Commands;
use App\Models\Track;
-use Gate;
+use Illuminate\Support\Facades\Gate;
class DeleteTrackCommand extends CommandBase
{
diff --git a/app/Commands/EditAlbumCommand.php b/app/Commands/EditAlbumCommand.php
index 0169cfb7..ec1e428c 100644
--- a/app/Commands/EditAlbumCommand.php
+++ b/app/Commands/EditAlbumCommand.php
@@ -23,10 +23,10 @@ namespace App\Commands;
use App\Models\Album;
use App\Models\Image;
use App\Models\User;
-use Auth;
-use DB;
-use Gate;
-use Validator;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
class EditAlbumCommand extends CommandBase
{
diff --git a/app/Commands/EditPlaylistCommand.php b/app/Commands/EditPlaylistCommand.php
index cb93346a..78fa2c4a 100644
--- a/app/Commands/EditPlaylistCommand.php
+++ b/app/Commands/EditPlaylistCommand.php
@@ -22,8 +22,8 @@ namespace App\Commands;
use App\Models\PinnedPlaylist;
use App\Models\Playlist;
-use Auth;
-use Validator;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Validator;
class EditPlaylistCommand extends CommandBase
{
diff --git a/app/Commands/EditTrackCommand.php b/app/Commands/EditTrackCommand.php
index 398c6493..d1864f39 100644
--- a/app/Commands/EditTrackCommand.php
+++ b/app/Commands/EditTrackCommand.php
@@ -26,9 +26,9 @@ use App\Models\Playlist;
use App\Models\Track;
use App\Models\TrackType;
use App\Models\User;
-use DB;
-use Gate;
-use Notification;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Notification;
class EditTrackCommand extends CommandBase
{
diff --git a/app/Commands/GenerateTrackFilesCommand.php b/app/Commands/GenerateTrackFilesCommand.php
index cd675723..a945e6fc 100644
--- a/app/Commands/GenerateTrackFilesCommand.php
+++ b/app/Commands/GenerateTrackFilesCommand.php
@@ -26,8 +26,8 @@ use App\Models\Track;
use App\Models\TrackFile;
use AudioCache;
use FFmpegMovie;
-use File;
use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\File;
use Illuminate\Support\Str;
use SplFileInfo;
diff --git a/app/Commands/MergeAccountsCommand.php b/app/Commands/MergeAccountsCommand.php
index b1483381..6d1af42b 100644
--- a/app/Commands/MergeAccountsCommand.php
+++ b/app/Commands/MergeAccountsCommand.php
@@ -34,7 +34,7 @@ use App\Models\ResourceUser;
use App\Models\Track;
use App\Models\User;
use Carbon\Carbon;
-use DB;
+use Illuminate\Support\Facades\DB;
class MergeAccountsCommand extends CommandBase
{
diff --git a/app/Commands/ParseTrackTagsCommand.php b/app/Commands/ParseTrackTagsCommand.php
index e65e6c21..8973644c 100755
--- a/app/Commands/ParseTrackTagsCommand.php
+++ b/app/Commands/ParseTrackTagsCommand.php
@@ -28,9 +28,9 @@ use App\Models\TrackType;
use App\Models\User;
use AudioCache;
use Carbon\Carbon;
-use Config;
-use File;
use getID3;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\File;
use Illuminate\Support\Str;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
diff --git a/app/Commands/RemoveTrackFromPlaylistCommand.php b/app/Commands/RemoveTrackFromPlaylistCommand.php
index 3301b711..b580d4ef 100644
--- a/app/Commands/RemoveTrackFromPlaylistCommand.php
+++ b/app/Commands/RemoveTrackFromPlaylistCommand.php
@@ -22,8 +22,8 @@ namespace App\Commands;
use App\Models\Playlist;
use App\Models\Track;
-use Auth;
-use DB;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
class RemoveTrackFromPlaylistCommand extends CommandBase
{
diff --git a/app/Commands/RenameGenreCommand.php b/app/Commands/RenameGenreCommand.php
index 2256eb5b..e2189f60 100644
--- a/app/Commands/RenameGenreCommand.php
+++ b/app/Commands/RenameGenreCommand.php
@@ -22,10 +22,10 @@ namespace App\Commands;
use App\Jobs\UpdateTagsForRenamedGenre;
use App\Models\Genre;
-use Gate;
use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
-use Validator;
class RenameGenreCommand extends CommandBase
{
diff --git a/app/Commands/RenameShowSongCommand.php b/app/Commands/RenameShowSongCommand.php
index 7821aa80..61d434b9 100644
--- a/app/Commands/RenameShowSongCommand.php
+++ b/app/Commands/RenameShowSongCommand.php
@@ -22,10 +22,10 @@ namespace App\Commands;
use App\Jobs\UpdateTagsForRenamedShowSong;
use App\Models\ShowSong;
-use Gate;
use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
-use Validator;
class RenameShowSongCommand extends CommandBase
{
diff --git a/app/Commands/SaveAccountSettingsCommand.php b/app/Commands/SaveAccountSettingsCommand.php
index fe6359f2..b571a6fd 100644
--- a/app/Commands/SaveAccountSettingsCommand.php
+++ b/app/Commands/SaveAccountSettingsCommand.php
@@ -22,9 +22,9 @@ namespace App\Commands;
use App\Models\Image;
use App\Models\User;
-use DB;
-use Gate;
-use Validator;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
class SaveAccountSettingsCommand extends CommandBase
{
diff --git a/app/Commands/ToggleFavouriteCommand.php b/app/Commands/ToggleFavouriteCommand.php
index ab48d159..1decb6b6 100644
--- a/app/Commands/ToggleFavouriteCommand.php
+++ b/app/Commands/ToggleFavouriteCommand.php
@@ -26,9 +26,9 @@ use App\Models\Favourite;
use App\Models\Playlist;
use App\Models\ResourceUser;
use App\Models\Track;
-use Auth;
-use DB;
-use Notification;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Notification;
class ToggleFavouriteCommand extends CommandBase
{
diff --git a/app/Commands/ToggleFollowingCommand.php b/app/Commands/ToggleFollowingCommand.php
index d15eb9a9..fca89ad2 100644
--- a/app/Commands/ToggleFollowingCommand.php
+++ b/app/Commands/ToggleFollowingCommand.php
@@ -22,8 +22,8 @@ namespace App\Commands;
use App\Models\Follower;
use App\Models\ResourceUser;
-use Auth;
-use Notification;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Notification;
class ToggleFollowingCommand extends CommandBase
{
diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php
index e11fef7f..1dd8fca8 100644
--- a/app/Commands/UploadTrackCommand.php
+++ b/app/Commands/UploadTrackCommand.php
@@ -22,13 +22,13 @@ namespace App\Commands;
use App\Models\Track;
use App\Models\User;
-use Auth;
use Carbon\Carbon;
-use Config;
-use Gate;
use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Request;
-use Validator;
+use Illuminate\Support\Facades\Validator;
class UploadTrackCommand extends CommandBase
{
diff --git a/app/Console/Commands/ClassifyMLPMA.php b/app/Console/Commands/ClassifyMLPMA.php
index 4a512b16..583a099c 100644
--- a/app/Console/Commands/ClassifyMLPMA.php
+++ b/app/Console/Commands/ClassifyMLPMA.php
@@ -23,8 +23,8 @@ namespace App\Console\Commands;
use App\Models\ShowSong;
use App\Models\Track;
use App\Models\TrackType;
-use DB;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
class ClassifyMLPMA extends Command
diff --git a/app/Console/Commands/ClearTrackCache.php b/app/Console/Commands/ClearTrackCache.php
index 765e8ff8..1ff6489a 100644
--- a/app/Console/Commands/ClearTrackCache.php
+++ b/app/Console/Commands/ClearTrackCache.php
@@ -22,8 +22,8 @@ namespace App\Console\Commands;
use App\Models\TrackFile;
use Carbon\Carbon;
-use File;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
class ClearTrackCache extends Command
{
diff --git a/app/Console/Commands/FixMLPMAImages.php b/app/Console/Commands/FixMLPMAImages.php
index 4c346fe2..7d10c5dd 100644
--- a/app/Console/Commands/FixMLPMAImages.php
+++ b/app/Console/Commands/FixMLPMAImages.php
@@ -21,11 +21,11 @@
namespace App\Console\Commands;
use App\Models\Image;
-use Config;
-use DB;
-use File;
use getID3;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
use Symfony\Component\HttpFoundation\File\UploadedFile;
class FixMLPMAImages extends Command
diff --git a/app/Console/Commands/ImportEQBeats.php b/app/Console/Commands/ImportEQBeats.php
index ddc02a8b..c139cade 100644
--- a/app/Console/Commands/ImportEQBeats.php
+++ b/app/Console/Commands/ImportEQBeats.php
@@ -8,13 +8,13 @@ use App\Models\Genre;
use App\Models\Image;
use App\Models\Track;
use App\Models\User;
-use Auth;
use Carbon\Carbon;
-use Config;
-use DB;
-use File;
use getID3;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
use Illuminate\Support\Str;
use Input;
use Symfony\Component\HttpFoundation\File\UploadedFile;
diff --git a/app/Console/Commands/MergeAccounts.php b/app/Console/Commands/MergeAccounts.php
index 7af3fe4b..9790f587 100644
--- a/app/Console/Commands/MergeAccounts.php
+++ b/app/Console/Commands/MergeAccounts.php
@@ -33,9 +33,9 @@ use App\Models\ResourceUser;
use App\Models\Track;
use App\Models\User;
use Carbon\Carbon;
-use DB;
use Illuminate\Console\Command;
use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
class MergeAccounts extends Command
{
diff --git a/app/Console/Commands/MigrateOldData.php b/app/Console/Commands/MigrateOldData.php
index 6060e241..22c84bc5 100644
--- a/app/Console/Commands/MigrateOldData.php
+++ b/app/Console/Commands/MigrateOldData.php
@@ -22,9 +22,9 @@ namespace App\Console\Commands;
use App\Models\Image;
use App\Models\ResourceLogItem;
-use DB;
use Exception;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
use Symfony\Component\HttpFoundation\File\UploadedFile;
class MigrateOldData extends Command
diff --git a/app/Console/Commands/RebuildFilesizes.php b/app/Console/Commands/RebuildFilesizes.php
index 16352bdc..c51248a2 100644
--- a/app/Console/Commands/RebuildFilesizes.php
+++ b/app/Console/Commands/RebuildFilesizes.php
@@ -21,8 +21,8 @@
namespace App\Console\Commands;
use App\Models\TrackFile;
-use File;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
class RebuildFilesizes extends Command
{
diff --git a/app/Console/Commands/RebuildTags.php b/app/Console/Commands/RebuildTags.php
index 8355aaab..f604ba9c 100644
--- a/app/Console/Commands/RebuildTags.php
+++ b/app/Console/Commands/RebuildTags.php
@@ -59,7 +59,7 @@ class RebuildTags extends Command
$track = Track::findOrFail($this->argument('trackId'));
$tracks = [$track];
} else {
- $tracks = Track::whereNotNull('published_at')->withTrashed()->orderBy('id', 'asc')->get();
+ $tracks = Track::whereNotNull('published_at')->withTrashed()->orderBy('id')->get();
}
$numberOfTracks = count($tracks);
diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
index af61ca1d..7b4475a3 100644
--- a/app/Console/Commands/RebuildTrackCache.php
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -23,9 +23,9 @@ namespace App\Console\Commands;
use App\Jobs\EncodeTrackFile;
use App\Models\Track;
use App\Models\TrackFile;
-use File;
use Illuminate\Console\Command;
use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\File;
class RebuildTrackCache extends Command
{
diff --git a/app/Console/Commands/RefreshCache.php b/app/Console/Commands/RefreshCache.php
index 289b342d..c51ea785 100644
--- a/app/Console/Commands/RefreshCache.php
+++ b/app/Console/Commands/RefreshCache.php
@@ -21,8 +21,8 @@
namespace App\Console\Commands;
use App\Models\ResourceLogItem;
-use DB;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
class RefreshCache extends Command
{
diff --git a/app/Console/Commands/SyncPoniverseAccounts.php b/app/Console/Commands/SyncPoniverseAccounts.php
index 6a28402f..2b25c9b1 100644
--- a/app/Console/Commands/SyncPoniverseAccounts.php
+++ b/app/Console/Commands/SyncPoniverseAccounts.php
@@ -71,7 +71,7 @@ class SyncPoniverseAccounts extends Command
%current%/%max% [%bar%] %percent:3s%% %elapsed:6s%');
$usersToUpdate
- ->orderBy('id', 'ASC')
+ ->orderBy('id')
->chunk(100, function ($users) use ($progress) {
/** @var User $user */
foreach ($users as $user) {
diff --git a/app/Console/Commands/VersionFiles.php b/app/Console/Commands/VersionFiles.php
index 66115e01..4fc7181f 100644
--- a/app/Console/Commands/VersionFiles.php
+++ b/app/Console/Commands/VersionFiles.php
@@ -21,8 +21,8 @@
namespace App\Console\Commands;
use App\Models\TrackFile;
-use File;
use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
class VersionFiles extends Command
{
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 01b2a13a..2087f2ed 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -20,9 +20,9 @@
namespace App\Http\Controllers;
-use Config;
-use Redirect;
-use View;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\View;
class AccountController extends Controller
{
@@ -33,7 +33,7 @@ class AccountController extends Controller
public function getRegister()
{
- return redirect(config('poniverse.urls')['register']);
+ return redirect()->to(config('poniverse.urls')['register']);
}
public function getNotifications()
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index c1073a8c..8b0df3ad 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -20,7 +20,7 @@
namespace App\Http\Controllers;
-use View;
+use Illuminate\Support\Facades\View;
class AdminController extends Controller
{
diff --git a/app/Http/Controllers/AlbumsController.php b/app/Http/Controllers/AlbumsController.php
index f70e4fca..d6c4e6dd 100644
--- a/app/Http/Controllers/AlbumsController.php
+++ b/app/Http/Controllers/AlbumsController.php
@@ -20,13 +20,13 @@
namespace App\Http\Controllers;
-use App;
use App\AlbumDownloader;
use App\Models\Album;
use App\Models\ResourceLogItem;
use App\Models\Track;
-use Redirect;
-use View;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\View;
class AlbumsController extends Controller
{
diff --git a/app/Http/Controllers/Api/Mobile/TracksController.php b/app/Http/Controllers/Api/Mobile/TracksController.php
index 26288b2c..1203f88c 100644
--- a/app/Http/Controllers/Api/Mobile/TracksController.php
+++ b/app/Http/Controllers/Api/Mobile/TracksController.php
@@ -22,7 +22,7 @@ namespace App\Http\Controllers\Api\Mobile;
use App\Http\Controllers\Controller;
use App\Models\Track;
-use Response;
+use Illuminate\Support\Facades\Response;
class TracksController extends Controller
{
@@ -44,7 +44,7 @@ class TracksController extends Controller
'tracks' => $tracks->toArray(),
];
- return Response::json($json, 200);
+ return response()->json($json, 200);
}
public function popular()
@@ -56,6 +56,6 @@ class TracksController extends Controller
'tracks' => $tracks->toArray(),
];
- return Response::json($json, 200);
+ return response()->json($json, 200);
}
}
diff --git a/app/Http/Controllers/Api/V1/TracksController.php b/app/Http/Controllers/Api/V1/TracksController.php
index 6021c2df..b2612efd 100644
--- a/app/Http/Controllers/Api/V1/TracksController.php
+++ b/app/Http/Controllers/Api/V1/TracksController.php
@@ -24,7 +24,7 @@ use App\Commands\UploadTrackCommand;
use App\Http\Controllers\ApiControllerBase;
use App\Models\Image;
use App\Models\Track;
-use Response;
+use Illuminate\Support\Facades\Response;
class TracksController extends ApiControllerBase
{
@@ -60,9 +60,9 @@ class TracksController extends ApiControllerBase
$this->authorize('edit', $track);
if ($track->status === Track::STATUS_PROCESSING) {
- return Response::json(['message' => 'Processing...'], 202);
+ return response()->json(['message' => 'Processing...'], 202);
} elseif ($track->status === Track::STATUS_COMPLETE) {
- return Response::json([
+ return response()->json([
'message' => $track->published_at
? 'Processing complete! The track is live at the track_url. The artist can edit the track by visiting its edit_url.'
: 'Processing complete! The artist must publish the track by visiting its edit_url.',
@@ -71,7 +71,7 @@ class TracksController extends ApiControllerBase
], 201);
} else {
// something went wrong
- return Response::json(['error' => 'Processing failed! Please contact logic@pony.fm to figure out what went wrong.'], 500);
+ return response()->json(['error' => 'Processing failed! Please contact logic@pony.fm to figure out what went wrong.'], 500);
}
}
@@ -92,10 +92,10 @@ class TracksController extends ApiControllerBase
->where('id', $id)->first();
if (! $track) {
- return Response::json(['message' => 'Track not found.'], 404);
+ return response()->json(['message' => 'Track not found.'], 404);
}
- return Response::json(self::trackToJson($track, false, true), 200);
+ return response()->json(self::trackToJson($track, false, true), 200);
}
/**
@@ -114,10 +114,10 @@ class TracksController extends ApiControllerBase
->where('hash', $hash)->first();
if (! $track) {
- return Response::json(['message' => 'Track not found.'], 403);
+ return response()->json(['message' => 'Track not found.'], 403);
}
- return Response::json(self::trackToJson($track, true, false), 200);
+ return response()->json(self::trackToJson($track, true, false), 200);
}
/**
diff --git a/app/Http/Controllers/Api/Web/AccountController.php b/app/Http/Controllers/Api/Web/AccountController.php
index a6543dd8..06139cde 100644
--- a/app/Http/Controllers/Api/Web/AccountController.php
+++ b/app/Http/Controllers/Api/Web/AccountController.php
@@ -24,10 +24,10 @@ use App\Commands\SaveAccountSettingsCommand;
use App\Http\Controllers\ApiControllerBase;
use App\Models\Image;
use App\Models\User;
-use Auth;
-use Gate;
-use Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Response;
class AccountController extends ApiControllerBase
{
@@ -35,23 +35,23 @@ class AccountController extends ApiControllerBase
{
$this->authorize('edit', $user);
- return Response::json([
+ return response()->json([
'user' => $user->toArray(),
]);
}
- public function getCurrentUser()
+ public function getCurrentUser(Request $request)
{
- $current_user = Auth::user();
+ $current_user = $request->user();
if ($current_user != null) {
$user = User::where('id', $current_user->id)->whereNull('disabled_at')->first();
if ($user == null) {
- return Response::json(['error' => 'You are not logged in'], 404);
+ return response()->json(['error' => 'You are not logged in'], 404);
}
- return Response::json([
+ return response()->json([
'id' => $user->id,
'name' => $user->display_name,
'slug' => $user->slug,
@@ -64,14 +64,14 @@ class AccountController extends ApiControllerBase
'created_at' => $user->created_at,
], 200);
} else {
- return Response::json(['error' => 'You are not logged in'], 404);
+ return response()->json(['error' => 'You are not logged in'], 404);
}
}
- public function getSettings($slug)
+ public function getSettings(Request $request, $slug)
{
$user = null;
- $current_user = Auth::user();
+ $current_user = $request->user();
if ($current_user != null) {
if ($slug == $current_user->slug) {
@@ -81,15 +81,15 @@ class AccountController extends ApiControllerBase
}
if ($user == null) {
- return Response::json(['error' => 'User does not exist'], 404);
+ return response()->json(['error' => 'User does not exist'], 404);
}
if (Gate::denies('edit', $user)) {
- return Response::json(['error' => 'You cannot do that. So stop trying!'], 403);
+ return response()->json(['error' => 'You cannot do that. So stop trying!'], 403);
}
}
- return Response::json([
+ return response()->json([
'id' => $user->id,
'bio' => $user->bio,
'can_see_explicit_content' => $user->can_see_explicit_content == 1,
@@ -104,8 +104,8 @@ class AccountController extends ApiControllerBase
], 200);
}
- public function postSave(User $user)
+ public function postSave(Request $request, User $user)
{
- return $this->execute(new SaveAccountSettingsCommand(Request::all(), $user));
+ return $this->execute(new SaveAccountSettingsCommand($request->all(), $user));
}
}
diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php
index 110237fd..dc2c76c3 100644
--- a/app/Http/Controllers/Api/Web/AlbumsController.php
+++ b/app/Http/Controllers/Api/Web/AlbumsController.php
@@ -29,22 +29,22 @@ use App\Models\Image;
use App\Models\ResourceLogItem;
use App\Models\Track;
use App\Models\User;
-use Auth;
-use Gate;
use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Response;
class AlbumsController extends ApiControllerBase
{
- public function postCreate()
+ public function postCreate(Request $request)
{
- return $this->execute(new CreateAlbumCommand(Request::all()));
+ return $this->execute(new CreateAlbumCommand($request->all()));
}
- public function postEdit($id)
+ public function postEdit(Request $request, $id)
{
- return $this->execute(new EditAlbumCommand($id, Request::all()));
+ return $this->execute(new EditAlbumCommand($id, $request->all()));
}
public function postDelete($id)
@@ -52,7 +52,7 @@ class AlbumsController extends ApiControllerBase
return $this->execute(new DeleteAlbumCommand($id));
}
- public function getShow($id)
+ public function getShow(Request $request, $id)
{
$album = Album::with([
'tracks' => function ($query) {
@@ -75,7 +75,7 @@ class AlbumsController extends ApiControllerBase
abort(404);
}
- if (Request::get('log')) {
+ if ($request->get('log')) {
ResourceLogItem::logItem('album', $id, ResourceLogItem::VIEW);
$album->view_count++;
}
@@ -85,7 +85,7 @@ class AlbumsController extends ApiControllerBase
unset($returned_album['formats']);
}
- return Response::json([
+ return response()->json([
'album' => $returned_album,
], 200);
}
@@ -114,14 +114,14 @@ class AlbumsController extends ApiControllerBase
$url = null;
}
- return Response::json(['url' => $url], 200);
+ return response()->json(['url' => $url], 200);
}
- public function getIndex()
+ public function getIndex(Request $request)
{
$page = 1;
- if (Request::has('page')) {
- $page = Request::get('page');
+ if ($request->has('page')) {
+ $page = $request->get('page');
}
$query = Album::summary()
@@ -134,7 +134,7 @@ class AlbumsController extends ApiControllerBase
$perPage = 40;
$query
- ->orderBy('title', 'asc')
+ ->orderBy('title')
->skip(($page - 1) * $perPage)
->take($perPage);
$albums = [];
@@ -143,7 +143,7 @@ class AlbumsController extends ApiControllerBase
$albums[] = Album::mapPublicAlbumSummary($album);
}
- return Response::json(
+ return response()->json(
['albums' => $albums, 'current_page' => $page, 'total_pages' => ceil($count / $perPage)],
200
);
@@ -156,7 +156,7 @@ class AlbumsController extends ApiControllerBase
$query = Album::summary()
->with('cover', 'user.avatar')
->where('user_id', $user->id)
- ->orderBy('created_at', 'desc')->get();
+ ->orderByDesc('created_at')->get();
$albums = [];
foreach ($query as $album) {
@@ -172,17 +172,17 @@ class AlbumsController extends ApiControllerBase
];
}
- return Response::json($albums, 200);
+ return response()->json($albums, 200);
}
- public function getEdit($id)
+ public function getEdit(Request $request, $id)
{
$album = Album::with('tracks')->find($id);
if (! $album) {
return $this->notFound('Album '.$id.' not found!');
}
- if (Gate::denies('edit', Auth::user())) {
+ if (Gate::denies('edit', $request->user())) {
return $this->notAuthorized();
}
@@ -194,7 +194,7 @@ class AlbumsController extends ApiControllerBase
];
}
- return Response::json([
+ return response()->json([
'id' => $album->id,
'title' => $album->title,
'user_id' => $album->user_id,
diff --git a/app/Http/Controllers/Api/Web/AnnouncementsController.php b/app/Http/Controllers/Api/Web/AnnouncementsController.php
index 19ef69a6..de1fa264 100644
--- a/app/Http/Controllers/Api/Web/AnnouncementsController.php
+++ b/app/Http/Controllers/Api/Web/AnnouncementsController.php
@@ -24,8 +24,8 @@ use App\Commands\CreateAnnouncementCommand;
use App\Http\Controllers\Controller;
use App\Models\Announcement;
use Carbon\Carbon;
-use Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Response;
class AnnouncementsController extends Controller
{
@@ -37,11 +37,11 @@ class AnnouncementsController extends Controller
->whereNotNull('end_time')
->where('start_time', '<', $currentDate)
->where('end_time', '>', $currentDate)
- ->orderBy('start_time', 'desc');
+ ->orderByDesc('start_time');
$announcement = $query->first();
- return Response::json(
+ return response()->json(
['announcement' => $announcement],
200
);
@@ -51,10 +51,10 @@ class AnnouncementsController extends Controller
{
$this->authorize('access-admin-area');
- $announcements = Announcement::orderBy('start_time', 'desc')
+ $announcements = Announcement::orderByDesc('start_time')
->get();
- return Response::json([
+ return response()->json([
'announcements' => $announcements->toArray(),
], 200);
}
@@ -64,19 +64,19 @@ class AnnouncementsController extends Controller
$this->authorize('access-admin-area');
$query = Announcement::where('id', '=', $genreId)
- ->orderBy('start_time', 'desc');
+ ->orderByDesc('start_time');
$announcement = $query->first();
- return Response::json(
+ return response()->json(
['announcement' => $announcement],
200
);
}
- public function postCreate()
+ public function postCreate(Request $request)
{
- $command = new CreateAnnouncementCommand(Request::get('name'));
+ $command = new CreateAnnouncementCommand($request->get('name'));
return $this->execute($command);
}
diff --git a/app/Http/Controllers/Api/Web/ArtistsController.php b/app/Http/Controllers/Api/Web/ArtistsController.php
index 99bc32a7..af8c17d3 100644
--- a/app/Http/Controllers/Api/Web/ArtistsController.php
+++ b/app/Http/Controllers/Api/Web/ArtistsController.php
@@ -20,7 +20,6 @@
namespace App\Http\Controllers\Api\Web;
-use App;
use App\Commands\CreateUserCommand;
use App\Http\Controllers\ApiControllerBase;
use App\Models\Album;
@@ -31,10 +30,11 @@ use App\Models\Image;
use App\Models\Track;
use App\Models\User;
use ColorThief\ColorThief;
-use Gate;
use Helpers;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Response;
class ArtistsController extends ApiControllerBase
{
@@ -78,7 +78,7 @@ class ArtistsController extends ApiControllerBase
}
}
- return Response::json([
+ return response()->json([
'tracks' => $tracks,
'albums' => $albums,
], 200);
@@ -112,7 +112,7 @@ class ArtistsController extends ApiControllerBase
$query = Album::summary()
->with('user')
- ->orderBy('created_at', 'desc')
+ ->orderByDesc('created_at')
->where('track_count', '>', 0)
->whereUserId($user->id);
@@ -122,7 +122,7 @@ class ArtistsController extends ApiControllerBase
$albums[] = Album::mapPublicAlbumSummary($album);
}
- return Response::json(['singles' => $singles, 'albumTracks' => $tracks, 'albums' => $albums], 200);
+ return response()->json(['singles' => $singles, 'albumTracks' => $tracks, 'albums' => $albums], 200);
}
public function getShow($slug)
@@ -148,7 +148,7 @@ class ArtistsController extends ApiControllerBase
->userDetails()
->whereUserId($user->id)
->whereNotNull('published_at')
- ->orderBy('created_at', 'desc')
+ ->orderByDesc('created_at')
->take(20);
$latestTracks = [];
@@ -178,7 +178,7 @@ class ArtistsController extends ApiControllerBase
$followers = Follower::where('artist_id', $user->id)
->count();
- return Response::json([
+ return response()->json([
'artist' => [
'id' => $user->id,
'name' => $user->display_name,
@@ -206,11 +206,11 @@ class ArtistsController extends ApiControllerBase
], 200);
}
- public function getIndex()
+ public function getIndex(Request $request)
{
$page = 1;
- if (Request::has('page')) {
- $page = Request::get('page');
+ if ($request->has('page')) {
+ $page = $request->get('page');
}
$query = User::where('track_count', '>', 0);
@@ -218,7 +218,7 @@ class ArtistsController extends ApiControllerBase
// The query results are ordered after they're counted
// due to Postgres's behaviour when combining those two operations.
- $query->orderBy('display_name', 'asc');
+ $query->orderBy('display_name');
$perPage = 40;
$query->skip(($page - 1) * $perPage)->take($perPage);
$users = [];
@@ -227,15 +227,15 @@ class ArtistsController extends ApiControllerBase
$users[] = User::mapPublicUserSummary($user);
}
- return Response::json(
+ return response()->json(
['artists' => $users, 'current_page' => $page, 'total_pages' => ceil($count / $perPage)],
200
);
}
- public function postIndex()
+ public function postIndex(Request $request)
{
- $name = Request::json('username');
+ $name = $request->json('username');
return $this->execute(new CreateUserCommand($name, $name, null, true));
}
diff --git a/app/Http/Controllers/Api/Web/CommentsController.php b/app/Http/Controllers/Api/Web/CommentsController.php
index 5b75fe40..9f1cb8fe 100644
--- a/app/Http/Controllers/Api/Web/CommentsController.php
+++ b/app/Http/Controllers/Api/Web/CommentsController.php
@@ -20,18 +20,18 @@
namespace App\Http\Controllers\Api\Web;
-use App;
use App\Commands\CreateCommentCommand;
use App\Http\Controllers\ApiControllerBase;
use App\Models\Comment;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Response;
class CommentsController extends ApiControllerBase
{
- public function postCreate($type, $id)
+ public function postCreate(Request $request, $type, $id)
{
- return $this->execute(new CreateCommentCommand($type, $id, Request::all()));
+ return $this->execute(new CreateCommentCommand($type, $id, $request->all()));
}
public function getIndex($type, $id)
@@ -56,13 +56,13 @@ class CommentsController extends ApiControllerBase
}
}
- $query = Comment::where($column, '=', $id)->orderBy('created_at', 'desc')->with('user');
+ $query = Comment::where($column, '=', $id)->orderByDesc('created_at')->with('user');
$comments = [];
foreach ($query->get() as $comment) {
$comments[] = Comment::mapPublic($comment);
}
- return Response::json(['list' => $comments, 'count' => count($comments)]);
+ return response()->json(['list' => $comments, 'count' => count($comments)]);
}
}
diff --git a/app/Http/Controllers/Api/Web/DashboardController.php b/app/Http/Controllers/Api/Web/DashboardController.php
index 5096d931..91b4dc69 100644
--- a/app/Http/Controllers/Api/Web/DashboardController.php
+++ b/app/Http/Controllers/Api/Web/DashboardController.php
@@ -22,12 +22,13 @@ namespace App\Http\Controllers\Api\Web;
use App\Http\Controllers\ApiControllerBase;
use App\Models\Track;
-use Auth;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Response;
class DashboardController extends ApiControllerBase
{
- public function getIndex()
+ public function getIndex(Request $request)
{
$recentQuery = Track::summary()
->with(['genre', 'user', 'cover', 'user.avatar'])
@@ -36,7 +37,7 @@ class DashboardController extends ApiControllerBase
->userDetails()
->explicitFilter()
->published()
- ->orderBy('published_at', 'desc')
+ ->orderByDesc('published_at')
->take(30);
$recentQuery->whereHas('user', function ($q) {
@@ -49,9 +50,9 @@ class DashboardController extends ApiControllerBase
$recentTracks[] = Track::mapPublicTrackSummary($track);
}
- return Response::json([
+ return response()->json([
'recent_tracks' => $recentTracks,
- 'popular_tracks' => Track::popular(30, Auth::check() && Auth::user()->can_see_explicit_content),
+ 'popular_tracks' => Track::popular(30, $request->user() && $request->user()->can_see_explicit_content),
], 200);
}
}
diff --git a/app/Http/Controllers/Api/Web/FavouritesController.php b/app/Http/Controllers/Api/Web/FavouritesController.php
index 965ba6be..6dbc78d2 100644
--- a/app/Http/Controllers/Api/Web/FavouritesController.php
+++ b/app/Http/Controllers/Api/Web/FavouritesController.php
@@ -26,21 +26,21 @@ use App\Models\Album;
use App\Models\Favourite;
use App\Models\Playlist;
use App\Models\Track;
-use Auth;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Response;
class FavouritesController extends ApiControllerBase
{
- public function postToggle()
+ public function postToggle(Request $request)
{
- return $this->execute(new ToggleFavouriteCommand(Request::get('type'), Request::get('id')));
+ return $this->execute(new ToggleFavouriteCommand($request->get('type'), $request->get('id')));
}
- public function getTracks()
+ public function getTracks(Request $request)
{
$query = Favourite
- ::whereUserId(Auth::user()->id)
+ ::whereUserId($request->user()->id)
->whereNotNull('track_id')
->with([
'track' => function ($query) {
@@ -65,13 +65,13 @@ class FavouritesController extends ApiControllerBase
$tracks[] = Track::mapPublicTrackSummary($fav->track);
}
- return Response::json(['tracks' => $tracks], 200);
+ return response()->json(['tracks' => $tracks], 200);
}
- public function getAlbums()
+ public function getAlbums(Request $request)
{
$query = Favourite
- ::whereUserId(Auth::user()->id)
+ ::whereUserId($request->user()->id)
->whereNotNull('album_id')
->with([
'album' => function ($query) {
@@ -92,13 +92,13 @@ class FavouritesController extends ApiControllerBase
$albums[] = Album::mapPublicAlbumSummary($fav->album);
}
- return Response::json(['albums' => $albums], 200);
+ return response()->json(['albums' => $albums], 200);
}
- public function getPlaylist()
+ public function getPlaylist(Request $request)
{
$query = Favourite
- ::whereUserId(Auth::user()->id)
+ ::whereUserId($request->user()->id)
->whereNotNull('playlist_id')
->with([
'playlist' => function ($query) {
@@ -120,6 +120,6 @@ class FavouritesController extends ApiControllerBase
$playlists[] = Playlist::mapPublicPlaylistSummary($fav->playlist);
}
- return Response::json(['playlists' => $playlists], 200);
+ return response()->json(['playlists' => $playlists], 200);
}
}
diff --git a/app/Http/Controllers/Api/Web/FollowController.php b/app/Http/Controllers/Api/Web/FollowController.php
index d89af2d6..3385e03e 100644
--- a/app/Http/Controllers/Api/Web/FollowController.php
+++ b/app/Http/Controllers/Api/Web/FollowController.php
@@ -22,12 +22,12 @@ namespace App\Http\Controllers\Api\Web;
use App\Commands\ToggleFollowingCommand;
use App\Http\Controllers\ApiControllerBase;
-use Illuminate\Support\Facades\Request;
+use Illuminate\Http\Request;
class FollowController extends ApiControllerBase
{
- public function postToggle()
+ public function postToggle(Request $request)
{
- return $this->execute(new ToggleFollowingCommand(Request::get('type'), Request::get('id')));
+ return $this->execute(new ToggleFollowingCommand($request->get('type'), $request->get('id')));
}
}
diff --git a/app/Http/Controllers/Api/Web/GenresController.php b/app/Http/Controllers/Api/Web/GenresController.php
index 754e38df..16776970 100644
--- a/app/Http/Controllers/Api/Web/GenresController.php
+++ b/app/Http/Controllers/Api/Web/GenresController.php
@@ -25,8 +25,8 @@ use App\Commands\DeleteGenreCommand;
use App\Commands\RenameGenreCommand;
use App\Http\Controllers\ApiControllerBase;
use App\Models\Genre;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Response;
class GenresController extends ApiControllerBase
{
@@ -37,31 +37,31 @@ class GenresController extends ApiControllerBase
$genres = Genre::with(['trackCountRelation' => function ($query) {
$query->withTrashed();
}])
- ->orderBy('name', 'asc')
+ ->orderBy('name')
->get();
- return Response::json([
+ return response()->json([
'genres' => $genres->toArray(),
], 200);
}
- public function postCreate()
+ public function postCreate(Request $request)
{
- $command = new CreateGenreCommand(Request::get('name'));
+ $command = new CreateGenreCommand($request->get('name'));
return $this->execute($command);
}
- public function putRename($genreId)
+ public function putRename(Request $request, $genreId)
{
- $command = new RenameGenreCommand($genreId, Request::get('name'));
+ $command = new RenameGenreCommand($genreId, $request->get('name'));
return $this->execute($command);
}
- public function deleteGenre($genreId)
+ public function deleteGenre(Request $request, $genreId)
{
- $command = new DeleteGenreCommand($genreId, Request::get('destination_genre_id'));
+ $command = new DeleteGenreCommand($genreId, $request->get('destination_genre_id'));
return $this->execute($command);
}
diff --git a/app/Http/Controllers/Api/Web/ImagesController.php b/app/Http/Controllers/Api/Web/ImagesController.php
index 5cf1fd2c..4a8f5f2f 100644
--- a/app/Http/Controllers/Api/Web/ImagesController.php
+++ b/app/Http/Controllers/Api/Web/ImagesController.php
@@ -23,8 +23,8 @@ namespace App\Http\Controllers\Api\Web;
use App\Http\Controllers\ApiControllerBase;
use App\Models\Image;
use App\Models\User;
-use Auth;
-use Response;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Response;
class ImagesController extends ApiControllerBase
{
@@ -48,6 +48,6 @@ class ImagesController extends ApiControllerBase
];
}
- return Response::json($images, 200);
+ return response()->json($images, 200);
}
}
diff --git a/app/Http/Controllers/Api/Web/NotificationsController.php b/app/Http/Controllers/Api/Web/NotificationsController.php
index dc310525..e5199a2a 100644
--- a/app/Http/Controllers/Api/Web/NotificationsController.php
+++ b/app/Http/Controllers/Api/Web/NotificationsController.php
@@ -25,8 +25,8 @@ use App\Models\Notification;
use App\Models\Subscription;
use App\Models\Track;
use App\Models\User;
-use Auth;
-use Illuminate\Support\Facades\Request;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
use Minishlink\WebPush\WebPush;
class NotificationsController extends ApiControllerBase
@@ -36,9 +36,9 @@ class NotificationsController extends ApiControllerBase
*
* @return array
*/
- public function getNotifications()
+ public function getNotifications(Request $request)
{
- $notifications = Notification::forUser(Auth::user())
+ $notifications = Notification::forUser($request->user())
->take(20)
->get();
@@ -54,10 +54,10 @@ class NotificationsController extends ApiControllerBase
*
* @return array
*/
- public function putMarkAsRead()
+ public function putMarkAsRead(Request $request)
{
- $notificationIds = Request::json('notification_ids');
- $numberOfUpdatedRows = Auth::user()
+ $notificationIds = $request->json('notification_ids');
+ $numberOfUpdatedRows = $request->user()
->notifications()
->whereIn('id', $notificationIds)
->update(['is_read' => true]);
@@ -72,17 +72,17 @@ class NotificationsController extends ApiControllerBase
*
* @return string
*/
- public function postSubscribe()
+ public function postSubscribe(Request $request)
{
- $input = json_decode(Request::json('subscription'));
+ $input = json_decode($request->json('subscription'));
if ($input != 'null') {
$existing = Subscription::where('endpoint', '=', $input->endpoint)
- ->where('user_id', '=', Auth::user()->id)
+ ->where('user_id', '=', $request->user()->id)
->first();
if ($existing === null) {
$subscription = Subscription::create([
- 'user_id' => Auth::user()->id,
+ 'user_id' => $request->user()->id,
'endpoint' => $input->endpoint,
'p256dh' => $input->keys->p256dh,
'auth' => $input->keys->auth,
@@ -102,12 +102,12 @@ class NotificationsController extends ApiControllerBase
*
* @return string
*/
- public function postUnsubscribe()
+ public function postUnsubscribe(Request $request)
{
- $input = json_decode(Request::json('subscription'));
+ $input = json_decode($request->json('subscription'));
$existing = Subscription::where('endpoint', '=', $input->endpoint)
- ->where('user_id', '=', Auth::user()->id)
+ ->where('user_id', '=', $request->user()->id)
->delete();
return ['result' => 'success'];
diff --git a/app/Http/Controllers/Api/Web/PlaylistsController.php b/app/Http/Controllers/Api/Web/PlaylistsController.php
index 0c1baed5..e858d395 100644
--- a/app/Http/Controllers/Api/Web/PlaylistsController.php
+++ b/app/Http/Controllers/Api/Web/PlaylistsController.php
@@ -31,21 +31,21 @@ use App\Models\Playlist;
use App\Models\ResourceLogItem;
use App\Models\Track;
use App\Models\User;
-use Auth;
use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Response;
class PlaylistsController extends ApiControllerBase
{
- public function postCreate()
+ public function postCreate(Request $request)
{
- return $this->execute(new CreatePlaylistCommand(Request::all()));
+ return $this->execute(new CreatePlaylistCommand($request->all()));
}
- public function postEdit($id)
+ public function postEdit(Request $request, $id)
{
- return $this->execute(new EditPlaylistCommand($id, Request::all()));
+ return $this->execute(new EditPlaylistCommand($id, $request->all()));
}
public function postDelete($id)
@@ -53,19 +53,19 @@ class PlaylistsController extends ApiControllerBase
return $this->execute(new DeletePlaylistCommand($id));
}
- public function postAddTrack($id)
+ public function postAddTrack(Request $request, $id)
{
- return $this->execute(new AddTrackToPlaylistCommand($id, Request::get('track_id')));
+ return $this->execute(new AddTrackToPlaylistCommand($id, $request->get('track_id')));
}
- public function postRemoveTrack($id)
+ public function postRemoveTrack(Request $request, $id)
{
- return $this->execute(new RemoveTrackFromPlaylistCommand($id, Request::get('track_id')));
+ return $this->execute(new RemoveTrackFromPlaylistCommand($id, $request->get('track_id')));
}
- public function getIndex()
+ public function getIndex(Request $request)
{
- $page = Request::has('page') ? Request::get('page') : 1;
+ $page = $request->has('page') ? $request->get('page') : 1;
$query = Playlist::summary()
->with(
@@ -94,14 +94,14 @@ class PlaylistsController extends ApiControllerBase
$playlists[] = Playlist::mapPublicPlaylistSummary($playlist);
}
- return Response::json([
+ return response()->json([
'playlists' => $playlists,
'current_page' => $page,
'total_pages' => ceil($count / $perPage),
], 200);
}
- public function getShow($id)
+ public function getShow(Request $request, $id)
{
$playlist = Playlist::with([
'tracks.user',
@@ -115,19 +115,19 @@ class PlaylistsController extends ApiControllerBase
'comments',
'comments.user',
])->userDetails()->find($id);
- if (! $playlist || ! $playlist->canView(Auth::user())) {
+ if (! $playlist || ! $playlist->canView($request->user())) {
abort('404');
}
- if (Request::get('log')) {
+ if ($request->get('log')) {
ResourceLogItem::logItem('playlist', $id, ResourceLogItem::VIEW);
$playlist->view_count++;
}
- return Response::json(Playlist::mapPublicPlaylistShow($playlist), 200);
+ return response()->json(Playlist::mapPublicPlaylistShow($playlist), 200);
}
- public function getCachedPlaylist($id, $format)
+ public function getCachedPlaylist(Request $request, $id, $format)
{
// Validation
try {
@@ -137,7 +137,7 @@ class PlaylistsController extends ApiControllerBase
return $this->notFound('Playlist not found!');
}
- if ((! $playlist->is_public && ! Auth::check()) || (! $playlist->is_public && ($playlist->user_id !== Auth::user()->id))) {
+ if ((! $playlist->is_public && ! $request->user()) || (! $playlist->is_public && ($playlist->user_id !== $request->user()->id))) {
return $this->notFound('Playlist not found!');
}
@@ -155,10 +155,10 @@ class PlaylistsController extends ApiControllerBase
$url = null;
}
- return Response::json(['url' => $url], 200);
+ return response()->json(['url' => $url], 200);
}
- public function getPinned()
+ public function getPinned(Request $request)
{
$query = Playlist
::userDetails()
@@ -166,8 +166,8 @@ class PlaylistsController extends ApiControllerBase
->join('pinned_playlists', function ($join) {
$join->on('playlist_id', '=', 'playlists.id');
})
- ->where('pinned_playlists.user_id', '=', Auth::user()->id)
- ->orderBy('title', 'asc')
+ ->where('pinned_playlists.user_id', '=', $request->user()->id)
+ ->orderBy('title')
->select('playlists.*')
->get();
@@ -179,15 +179,15 @@ class PlaylistsController extends ApiControllerBase
$playlists[] = $mapped;
}
- return Response::json($playlists, 200);
+ return response()->json($playlists, 200);
}
- public function getOwned(User $user)
+ public function getOwned(Request $request, User $user)
{
$query = Playlist::summary()
->with('pins', 'tracks', 'tracks.cover')
->where('user_id', $user->id)
- ->orderBy('title', 'asc')
+ ->orderBy('title')
->get();
$playlists = [];
@@ -203,13 +203,13 @@ class PlaylistsController extends ApiControllerBase
'small' => $playlist->getCoverUrl(Image::SMALL),
'normal' => $playlist->getCoverUrl(Image::NORMAL),
],
- 'is_pinned' => $playlist->hasPinFor(Auth::user()->id),
+ 'is_pinned' => $playlist->hasPinFor($request->user()->id),
'is_public' => $playlist->is_public == 1,
'track_ids' => $playlist->tracks->pluck('id'),
];
}
- return Response::json($playlists, 200);
+ return response()->json($playlists, 200);
}
/**
diff --git a/app/Http/Controllers/Api/Web/SearchController.php b/app/Http/Controllers/Api/Web/SearchController.php
index 99ef341b..13330409 100644
--- a/app/Http/Controllers/Api/Web/SearchController.php
+++ b/app/Http/Controllers/Api/Web/SearchController.php
@@ -23,16 +23,16 @@ namespace App\Http\Controllers\Api\Web;
use App\Http\Controllers\ApiControllerBase;
use App\Library\Search;
use Elasticsearch;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Response;
class SearchController extends ApiControllerBase
{
- public function getSearch(Search $search)
+ public function getSearch(Request $request, Search $search)
{
- $results = $search->searchAllContent(Request::query('query'));
+ $results = $search->searchAllContent($request->query('query'));
- return Response::json([
+ return response()->json([
'results' => $results,
], 200);
}
diff --git a/app/Http/Controllers/Api/Web/ShowSongsController.php b/app/Http/Controllers/Api/Web/ShowSongsController.php
index f7cfd3ee..076ec4aa 100644
--- a/app/Http/Controllers/Api/Web/ShowSongsController.php
+++ b/app/Http/Controllers/Api/Web/ShowSongsController.php
@@ -25,8 +25,8 @@ use App\Commands\DeleteShowSongCommand;
use App\Commands\RenameShowSongCommand;
use App\Http\Controllers\ApiControllerBase;
use App\Models\ShowSong;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Response;
class ShowSongsController extends ApiControllerBase
{
@@ -37,32 +37,32 @@ class ShowSongsController extends ApiControllerBase
$songs = ShowSong::with(['trackCountRelation' => function ($query) {
$query->withTrashed();
}])
- ->orderBy('title', 'asc')
+ ->orderBy('title')
->select('id', 'title', 'slug')
->get();
- return Response::json([
+ return response()->json([
'showsongs' => $songs->toArray(),
], 200);
}
- public function postCreate()
+ public function postCreate(Request $request)
{
- $command = new CreateShowSongCommand(Request::get('title'));
+ $command = new CreateShowSongCommand($request->get('title'));
return $this->execute($command);
}
- public function putRename($songId)
+ public function putRename(Request $request, $songId)
{
- $command = new RenameShowSongCommand($songId, Request::get('title'));
+ $command = new RenameShowSongCommand($songId, $request->get('title'));
return $this->execute($command);
}
- public function deleteSong($songId)
+ public function deleteSong(Request $request, $songId)
{
- $command = new DeleteShowSongCommand($songId, Request::get('destination_song_id'));
+ $command = new DeleteShowSongCommand($songId, $request->get('destination_song_id'));
return $this->execute($command);
}
diff --git a/app/Http/Controllers/Api/Web/StatsController.php b/app/Http/Controllers/Api/Web/StatsController.php
index 1f6b1c2a..56382c9d 100644
--- a/app/Http/Controllers/Api/Web/StatsController.php
+++ b/app/Http/Controllers/Api/Web/StatsController.php
@@ -23,13 +23,14 @@ namespace App\Http\Controllers\Api\Web;
use App\Http\Controllers\ApiControllerBase;
use App\Models\ResourceLogItem;
use App\Models\Track;
-use Auth;
-use Cache;
use Carbon\Carbon;
-use DB;
use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Response;
use Illuminate\Support\Str;
-use Response;
class StatsController extends ApiControllerBase
{
@@ -101,13 +102,13 @@ class StatsController extends ApiControllerBase
}
if ($hourly) {
- return Response::json(['playStats' => $output, 'type' => 'Hourly'], 200);
+ return response()->json(['playStats' => $output, 'type' => 'Hourly'], 200);
} else {
- return Response::json(['playStats' => $output, 'type' => 'Daily'], 200);
+ return response()->json(['playStats' => $output, 'type' => 'Daily'], 200);
}
}
- public function getTrackStats($id)
+ public function getTrackStats(Request $request, $id)
{
$cachedOutput = Cache::remember('track_stats'.$id, 300, function () use ($id) {
try {
@@ -117,7 +118,7 @@ class StatsController extends ApiControllerBase
}
// Do we have permission to view this track?
- if (! $track->canView(Auth::user())) {
+ if (! $track->canView($request->user())) {
return $this->notFound('Track not found!');
}
diff --git a/app/Http/Controllers/Api/Web/TaxonomiesController.php b/app/Http/Controllers/Api/Web/TaxonomiesController.php
index b917c8c9..f259b5d3 100644
--- a/app/Http/Controllers/Api/Web/TaxonomiesController.php
+++ b/app/Http/Controllers/Api/Web/TaxonomiesController.php
@@ -25,13 +25,13 @@ use App\Models\Genre;
use App\Models\License;
use App\Models\ShowSong;
use App\Models\TrackType;
-use DB;
+use Illuminate\Support\Facades\DB;
class TaxonomiesController extends ApiControllerBase
{
public function getAll()
{
- return \Response::json([
+ return response()->json([
'licenses' => License::all()->toArray(),
'genres' => Genre::with('trackCountRelation')
->orderBy('name')
diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php
index 485b72ff..fb6462cb 100644
--- a/app/Http/Controllers/Api/Web/TracksController.php
+++ b/app/Http/Controllers/Api/Web/TracksController.php
@@ -32,11 +32,11 @@ use App\Models\Track;
use App\Models\TrackFile;
use App\Models\TrackType;
use App\Models\User;
-use Auth;
-use File;
use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\Facades\Request;
-use Response;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Response;
use Symfony\Component\HttpFoundation\File\UploadedFile;
class TracksController extends ApiControllerBase
@@ -54,12 +54,12 @@ class TracksController extends ApiControllerBase
$this->authorize('edit', $track);
if ($track->status === Track::STATUS_PROCESSING) {
- return Response::json(['message' => 'Processing...'], 202);
+ return response()->json(['message' => 'Processing...'], 202);
} elseif ($track->status === Track::STATUS_COMPLETE) {
- return Response::json(['message' => 'Processing complete!'], 201);
+ return response()->json(['message' => 'Processing complete!'], 201);
} else {
// something went wrong
- return Response::json(['error' => 'Processing failed!'], 500);
+ return response()->json(['error' => 'Processing failed!'], 500);
}
}
@@ -68,9 +68,9 @@ class TracksController extends ApiControllerBase
return $this->execute(new DeleteTrackCommand($id));
}
- public function postEdit($id)
+ public function postEdit(Request $request, $id)
{
- return $this->execute(new EditTrackCommand($id, Request::all()));
+ return $this->execute(new EditTrackCommand($id, $request->all()));
}
public function postUploadNewVersion($trackId)
@@ -95,12 +95,12 @@ class TracksController extends ApiControllerBase
$this->authorize('edit', $track);
if ($track->version_upload_status === Track::STATUS_PROCESSING) {
- return Response::json(['message' => 'Processing...'], 202);
+ return response()->json(['message' => 'Processing...'], 202);
} elseif ($track->version_upload_status === Track::STATUS_COMPLETE) {
- return Response::json(['message' => 'Processing complete!'], 201);
+ return response()->json(['message' => 'Processing complete!'], 201);
} else {
// something went wrong
- return Response::json(['error' => 'Processing failed!'], 500);
+ return response()->json(['error' => 'Processing failed!'], 500);
}
}
@@ -119,7 +119,7 @@ class TracksController extends ApiControllerBase
];
}
- return Response::json(['current_version' => $track->current_version, 'versions' => $versions], 200);
+ return response()->json(['current_version' => $track->current_version, 'versions' => $versions], 200);
}
public function getChangeVersion($trackId, $newVersion)
@@ -142,14 +142,14 @@ class TracksController extends ApiControllerBase
return $this->execute(new GenerateTrackFilesCommand($track, $sourceFile, false, false, true, $newVersion));
}
- public function getShow($id)
+ public function getShow(Request $request, $id)
{
$track = Track::userDetails()->withComments()->find($id);
- if (! $track || ! $track->canView(Auth::user())) {
+ if (! $track || ! $track->canView($request->user())) {
return $this->notFound('Track not found!');
}
- if (Request::get('log')) {
+ if ($request->get('log')) {
ResourceLogItem::logItem('track', $id, ResourceLogItem::VIEW);
$track->view_count++;
}
@@ -159,10 +159,10 @@ class TracksController extends ApiControllerBase
unset($returned_track['formats']);
}
- return Response::json(['track' => $returned_track], 200);
+ return response()->json(['track' => $returned_track], 200);
}
- public function getCachedTrack($id, $format)
+ public function getCachedTrack(Request $request, $id, $format)
{
// Validation
try {
@@ -171,7 +171,7 @@ class TracksController extends ApiControllerBase
return $this->notFound('Track not found!');
}
- if (! $track->canView(Auth::user())) {
+ if (! $track->canView($request->user())) {
return $this->notFound('Track not found!');
}
@@ -199,16 +199,16 @@ class TracksController extends ApiControllerBase
$url = null;
}
- return Response::json(['url' => $url], 200);
+ return response()->json(['url' => $url], 200);
}
- public function getIndex($all = false, $unknown = false)
+ public function getIndex(Request $request, $all = false, $unknown = false)
{
$page = 1;
$perPage = 45;
- if (Request::has('page')) {
- $page = Request::get('page');
+ if ($request->has('page')) {
+ $page = $request->get('page');
}
if ($all) {
@@ -240,7 +240,7 @@ class TracksController extends ApiControllerBase
$ids[] = $track->id;
}
- return Response::json([
+ return response()->json([
'tracks' => $tracks,
'current_page' => $page,
'total_pages' => ceil($totalCount / $perPage),
@@ -263,14 +263,14 @@ class TracksController extends ApiControllerBase
public function getOwned(User $user)
{
- $query = Track::summary()->where('user_id', $user->id)->orderBy('created_at', 'desc');
+ $query = Track::summary()->where('user_id', $user->id)->orderByDesc('created_at');
$tracks = [];
foreach ($query->get() as $track) {
$tracks[] = Track::mapPrivateTrackSummary($track);
}
- return Response::json($tracks, 200);
+ return response()->json($tracks, 200);
}
public function getEdit($id)
@@ -282,7 +282,7 @@ class TracksController extends ApiControllerBase
$this->authorize('edit', $track);
- return Response::json(Track::mapPrivateTrackShow($track), 200);
+ return response()->json(Track::mapPrivateTrackShow($track), 200);
}
/**
diff --git a/app/Http/Controllers/ApiControllerBase.php b/app/Http/Controllers/ApiControllerBase.php
index 8a97a9d0..6d499d4a 100644
--- a/app/Http/Controllers/ApiControllerBase.php
+++ b/app/Http/Controllers/ApiControllerBase.php
@@ -21,7 +21,7 @@
namespace App\Http\Controllers;
use App\Commands\CommandBase;
-use Response;
+use Illuminate\Support\Facades\Response;
abstract class ApiControllerBase extends Controller
{
@@ -40,22 +40,22 @@ abstract class ApiControllerBase extends Controller
$result = $command->execute();
if ($result->didFail()) {
- return Response::json([
+ return response()->json([
'message' => 'Validation failed',
'errors' => $result->getMessages(),
], $result->getStatusCode());
}
- return Response::json($result->getResponse(), $result->getStatusCode());
+ return response()->json($result->getResponse(), $result->getStatusCode());
}
public function notAuthorized()
{
- return Response::json(['message' => 'You may not do this!'], 403);
+ return response()->json(['message' => 'You may not do this!'], 403);
}
public function notFound($message)
{
- return Response::json(['message' => $message], 403);
+ return response()->json(['message' => $message], 403);
}
}
diff --git a/app/Http/Controllers/ArtistsController.php b/app/Http/Controllers/ArtistsController.php
index 2e6aa64d..d345230d 100644
--- a/app/Http/Controllers/ArtistsController.php
+++ b/app/Http/Controllers/ArtistsController.php
@@ -20,10 +20,10 @@
namespace App\Http\Controllers;
-use App;
use App\Models\User;
-use Redirect;
-use View;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\View;
class ArtistsController extends Controller
{
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 310c89e9..420d42e4 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -22,15 +22,15 @@ namespace App\Http\Controllers;
use App\Models\Activity;
use App\Models\User;
-use Auth;
use Carbon\Carbon;
-use DB;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Redirect;
use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
use League\OAuth2\Client\Token\AccessToken;
-use Log;
use Poniverse\Lib\Client;
-use Redirect;
-use Request;
class AuthController extends Controller
{
@@ -50,23 +50,23 @@ class AuthController extends Controller
->getAuthorizationUrl());
}
- return redirect('/');
+ return redirect()->to('/');
}
public function postLogout()
{
Auth::logout();
- return redirect('/');
+ return redirect()->to('/');
}
- public function getOAuth()
+ public function getOAuth(Request $request)
{
$oauthProvider = $this->poniverse->getOAuthProvider();
try {
$accessToken = $oauthProvider->getAccessToken('authorization_code', [
- 'code' => Request::query('code'),
+ 'code' => $request->query('code'),
'redirect_uri' => action('AuthController@getOAuth'),
]);
$this->poniverse->setAccessToken($accessToken);
@@ -74,7 +74,7 @@ class AuthController extends Controller
} catch (IdentityProviderException $e) {
Log::error($e);
- return redirect('/')->with(
+ return redirect()->to('/')->with(
'message',
'Unfortunately we are having problems attempting to log you in at the moment. Please try again at a later time.'
);
@@ -129,14 +129,14 @@ class AuthController extends Controller
*
* @return \Illuminate\Http\JsonResponse
*/
- public function postPoniverseAccountSync()
+ public function postPoniverseAccountSync(Request $request)
{
- $poniverseId = Request::get('id');
- $updatedAttribute = Request::get('attribute');
+ $poniverseId = $request->get('id');
+ $updatedAttribute = $request->get('attribute');
// Only email address updates are supported at this time.
if ('email' !== $updatedAttribute) {
- return \Response::json(['message' => 'Unsupported Poniverse account attribute.'], 400);
+ return response()->json(['message' => 'Unsupported Poniverse account attribute.'], 400);
}
$user = User::wherePoniverseId($poniverseId)->first();
@@ -154,13 +154,13 @@ class AuthController extends Controller
$user->{$updatedAttribute} = $newUserData->{$updatedAttribute};
$user->save();
- return \Response::json(['message' => 'Successfully updated this user!'], 200);
+ return response()->json(['message' => 'Successfully updated this user!'], 200);
}
protected function loginRedirect($user, $rememberMe = true)
{
Auth::login($user, $rememberMe);
- return redirect('/');
+ return redirect()->to('/');
}
}
diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php
index 7f251d3d..c9b72fef 100644
--- a/app/Http/Controllers/ContentController.php
+++ b/app/Http/Controllers/ContentController.php
@@ -20,7 +20,7 @@
namespace App\Http\Controllers;
-use View;
+use Illuminate\Support\Facades\View;
class ContentController extends Controller
{
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 170b76d1..defda27b 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -20,7 +20,7 @@
namespace App\Http\Controllers;
-use View;
+use Illuminate\Support\Facades\View;
class HomeController extends Controller
{
diff --git a/app/Http/Controllers/ImagesController.php b/app/Http/Controllers/ImagesController.php
index e9a6aba9..676b962c 100644
--- a/app/Http/Controllers/ImagesController.php
+++ b/app/Http/Controllers/ImagesController.php
@@ -20,11 +20,11 @@
namespace App\Http\Controllers;
-use App;
use App\Models\Image;
-use Config;
-use Redirect;
-use Response;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
class ImagesController extends Controller
{
@@ -41,13 +41,13 @@ class ImagesController extends Controller
abort(404);
}
- $response = response('', 200);
+ $response = response()->noContent(200);
$filename = $image->getFile($coverType['id']);
if (! is_file($filename)) {
$redirect = url('/images/icons/profile_'.Image::$ImageTypes[$coverType['id']]['name'].'.png');
- return redirect($redirect);
+ return redirect()->to($redirect);
}
if (config('app.sendfile')) {
diff --git a/app/Http/Controllers/NotificationsController.php b/app/Http/Controllers/NotificationsController.php
index 19081f73..9634e90e 100644
--- a/app/Http/Controllers/NotificationsController.php
+++ b/app/Http/Controllers/NotificationsController.php
@@ -20,12 +20,13 @@
namespace App\Http\Controllers;
-use App;
use App\Models\Email;
use App\Models\EmailSubscription;
-use Auth;
-use DB;
-use View;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\View;
class NotificationsController extends Controller
{
@@ -33,36 +34,36 @@ class NotificationsController extends Controller
* @param $emailKey
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
- public function getEmailClick($emailKey)
+ public function getEmailClick(Request $request, $emailKey)
{
/** @var Email $email */
$email = Email::findOrFail($emailKey);
DB::transaction(function () use ($email) {
- $email->emailClicks()->create(['ip_address' => \Request::ip()]);
+ $email->emailClicks()->create(['ip_address' => $request->ip()]);
$email->notification->is_read = true;
$email->notification->save();
});
- return redirect($email->getActivity()->url);
+ return redirect()->to($email->getActivity()->url);
}
- public function getEmailUnsubscribe($subscriptionKey)
+ public function getEmailUnsubscribe(Request $request, $subscriptionKey)
{
/** @var EmailSubscription $subscription */
$subscription = EmailSubscription::findOrFail($subscriptionKey);
$subscription->delete();
- if (Auth::check() && $subscription->user->id === Auth::user()->id) {
+ if ($request->user() && $subscription->user->id === $request->user()->id) {
return redirect(route('account:settings', [
'slug' => $subscription->user->slug,
'unsubscribedMessageKey' => $subscription->activity_type,
- ]), 303);
+ ]), );
} else {
return redirect(route('email:confirm-unsubscribed', [
'unsubscribedUser' => $subscription->user->display_name,
'unsubscribedMessageKey' => $subscription->activity_type,
- ]), 303);
+ ]), );
}
}
diff --git a/app/Http/Controllers/PlaylistsController.php b/app/Http/Controllers/PlaylistsController.php
index 5c87f28c..01585f19 100644
--- a/app/Http/Controllers/PlaylistsController.php
+++ b/app/Http/Controllers/PlaylistsController.php
@@ -20,14 +20,15 @@
namespace App\Http\Controllers;
-use App;
use App\Models\Playlist;
use App\Models\ResourceLogItem;
use App\Models\Track;
use App\PlaylistDownloader;
-use Auth;
-use Redirect;
-use View;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\View;
class PlaylistsController extends Controller
{
@@ -36,10 +37,10 @@ class PlaylistsController extends Controller
return view('playlists.index');
}
- public function getPlaylist($id, $slug)
+ public function getPlaylist(Request $request, $id, $slug)
{
$playlist = Playlist::find($id);
- if (! $playlist || ! $playlist->canView(Auth::user())) {
+ if (! $playlist || ! $playlist->canView($request->user())) {
abort(404);
}
@@ -50,20 +51,20 @@ class PlaylistsController extends Controller
return view('playlists.show');
}
- public function getShortlink($id)
+ public function getShortlink(Request $request, $id)
{
$playlist = Playlist::find($id);
- if (! $playlist || ! $playlist->canView(Auth::user())) {
+ if (! $playlist || ! $playlist->canView($request->user())) {
abort(404);
}
return Redirect::action('PlaylistsController@getPlaylist', [$id, $playlist->slug]);
}
- public function getDownload($id, $extension)
+ public function getDownload(Request $request, $id, $extension)
{
$playlist = Playlist::with('tracks', 'tracks.trackFiles', 'user', 'tracks.album')->find($id);
- if (! $playlist || ! $playlist->canView(Auth::user())) {
+ if (! $playlist || ! $playlist->canView($request->user())) {
abort(404);
}
@@ -88,6 +89,6 @@ class PlaylistsController extends Controller
ResourceLogItem::logItem('playlist', $id, ResourceLogItem::DOWNLOAD, $format['index']);
$downloader = new PlaylistDownloader($playlist, $formatName);
- $downloader->download(Auth::user());
+ $downloader->download($request->user());
}
}
diff --git a/app/Http/Controllers/StatsController.php b/app/Http/Controllers/StatsController.php
index 897cc1d0..4e14ad6e 100644
--- a/app/Http/Controllers/StatsController.php
+++ b/app/Http/Controllers/StatsController.php
@@ -20,7 +20,7 @@
namespace App\Http\Controllers;
-use View;
+use Illuminate\Support\Facades\View;
class StatsController extends Controller
{
diff --git a/app/Http/Controllers/TracksController.php b/app/Http/Controllers/TracksController.php
index 3db49e83..3b0a8629 100644
--- a/app/Http/Controllers/TracksController.php
+++ b/app/Http/Controllers/TracksController.php
@@ -20,16 +20,16 @@
namespace App\Http\Controllers;
-use App;
use App\Models\ResourceLogItem;
use App\Models\Track;
use App\Models\TrackFile;
-use Auth;
-use Config;
use Illuminate\Http\Request;
-use Redirect;
-use Response;
-use View;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
class TracksController extends Controller
{
@@ -38,7 +38,7 @@ class TracksController extends Controller
return view('tracks.index');
}
- public function getEmbed($id)
+ public function getEmbed(Request $request, $id)
{
$track = Track
::whereId($id)
@@ -50,7 +50,7 @@ class TracksController extends Controller
'genre'
)->first();
- if (! $track || ! $track->canView(Auth::user())) {
+ if (! $track || ! $track->canView($request->user())) {
abort(404);
}
@@ -93,7 +93,7 @@ class TracksController extends Controller
->userDetails()
->first();
- if (! $track || ! $track->canView(Auth::user())) {
+ if (! $track || ! $track->canView($request->user())) {
abort(404);
}
@@ -110,13 +110,13 @@ class TracksController extends Controller
'html' => '',
];
- return Response::json($output);
+ return response()->json($output);
}
- public function getTrack($id, $slug)
+ public function getTrack(Request $request, $id, $slug)
{
$track = Track::find($id);
- if (! $track || ! $track->canView(Auth::user())) {
+ if (! $track || ! $track->canView($request->user())) {
abort(404);
}
@@ -132,26 +132,26 @@ class TracksController extends Controller
return $this->getTrack($id, $slug);
}
- public function getShortlink($id)
+ public function getShortlink(Request $request, $id)
{
$track = Track::find($id);
- if (! $track || ! $track->canView(Auth::user())) {
+ if (! $track || ! $track->canView($request->user())) {
abort(404);
}
return Redirect::action('TracksController@getTrack', [$id, $track->slug]);
}
- public function getStream($id, $extension)
+ public function getStream(Request $request, $id, $extension)
{
$track = Track::find($id);
- if (! $track || ! $track->canView(Auth::user())) {
+ if (! $track || ! $track->canView($request->user())) {
abort(404);
}
$trackFile = TrackFile::findOrFailByExtension($track->id, $extension);
- $response = response('', 200);
+ $response = response()->noContent(200);
$filename = $trackFile->getFile();
if (! file_exists($filename)) {
@@ -179,17 +179,17 @@ class TracksController extends Controller
return $response;
}
- public function getDownload($id, $extension)
+ public function getDownload(Request $request, $id, $extension)
{
$track = Track::find($id);
- if (! $track || ! $track->canView(Auth::user())) {
+ if (! $track || ! $track->canView($request->user())) {
abort(404);
}
$trackFile = TrackFile::findOrFailByExtension($track->id, $extension);
ResourceLogItem::logItem('track', $id, ResourceLogItem::DOWNLOAD, $trackFile->getFormat()['index']);
- $response = response('', 200);
+ $response = response()->noContent(200);
$filename = $trackFile->getFile();
if (config('app.sendfile')) {
diff --git a/app/Http/Controllers/UploaderController.php b/app/Http/Controllers/UploaderController.php
index 3a5e1943..b15e1910 100644
--- a/app/Http/Controllers/UploaderController.php
+++ b/app/Http/Controllers/UploaderController.php
@@ -20,7 +20,7 @@
namespace App\Http\Controllers;
-use View;
+use Illuminate\Support\Facades\View;
class UploaderController extends Controller
{
diff --git a/app/Http/Middleware/Authorize.php b/app/Http/Middleware/Authorize.php
index bd899510..495343ac 100644
--- a/app/Http/Middleware/Authorize.php
+++ b/app/Http/Middleware/Authorize.php
@@ -21,8 +21,8 @@
namespace App\Http\Middleware;
use Closure;
-use Gate;
use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Support\Facades\Gate;
class Authorize
{
diff --git a/app/Http/Middleware/DisabledAccountCheck.php b/app/Http/Middleware/DisabledAccountCheck.php
index c6703a99..a9998bca 100644
--- a/app/Http/Middleware/DisabledAccountCheck.php
+++ b/app/Http/Middleware/DisabledAccountCheck.php
@@ -22,7 +22,7 @@ namespace App\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;
-use Log;
+use Illuminate\Support\Facades\Log;
class DisabledAccountCheck
{
diff --git a/app/Http/Middleware/JsonExceptions.php b/app/Http/Middleware/JsonExceptions.php
index 6c625071..f365cf2c 100644
--- a/app/Http/Middleware/JsonExceptions.php
+++ b/app/Http/Middleware/JsonExceptions.php
@@ -40,7 +40,7 @@ class JsonExceptions
try {
$response = $next($request);
} catch (HttpException $e) {
- return \Response::json([
+ return response()->json([
'message' => $e->getMessage(),
], $e->getStatusCode());
}
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index e5dc4b2f..f40cd456 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -41,7 +41,7 @@ class RedirectIfAuthenticated
foreach ($guards as $guard) {
if (Auth::guard($guard)->check()) {
- return redirect(RouteServiceProvider::HOME);
+ return redirect()->to(RouteServiceProvider::HOME);
}
}
diff --git a/app/Jobs/DeleteGenre.php b/app/Jobs/DeleteGenre.php
index 646cda53..714519dd 100644
--- a/app/Jobs/DeleteGenre.php
+++ b/app/Jobs/DeleteGenre.php
@@ -22,10 +22,10 @@ namespace App\Jobs;
use App\Models\Genre;
use App\Models\Track;
-use Auth;
-use DB;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
use SerializesModels;
class DeleteGenre extends Job implements ShouldQueue
diff --git a/app/Jobs/DeleteShowSong.php b/app/Jobs/DeleteShowSong.php
index 35fc68f4..99087a50 100644
--- a/app/Jobs/DeleteShowSong.php
+++ b/app/Jobs/DeleteShowSong.php
@@ -22,10 +22,10 @@ namespace App\Jobs;
use App\Models\ShowSong;
use App\Models\Track;
-use Auth;
-use DB;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
use SerializesModels;
class DeleteShowSong extends Job implements ShouldQueue
diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php
index 3b2b5cb6..860c93d6 100644
--- a/app/Jobs/EncodeTrackFile.php
+++ b/app/Jobs/EncodeTrackFile.php
@@ -25,13 +25,13 @@ use App\Exceptions\InvalidEncodeOptionsException;
use App\Models\Track;
use App\Models\TrackFile;
use Carbon\Carbon;
-use Config;
-use DB;
-use File;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
-use Log;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Log;
use Symfony\Component\Process\Exception\ProcessFailedException;
use Symfony\Component\Process\Process;
diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php
index 62378f68..d57fdcfb 100644
--- a/app/Jobs/Job.php
+++ b/app/Jobs/Job.php
@@ -20,9 +20,9 @@
namespace App\Jobs;
-use App;
-use DB;
use Illuminate\Bus\Queueable;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\DB;
abstract class Job
{
diff --git a/app/Jobs/UpdateSearchIndexForEntity.php b/app/Jobs/UpdateSearchIndexForEntity.php
index d5bc2e82..3e5a2671 100644
--- a/app/Jobs/UpdateSearchIndexForEntity.php
+++ b/app/Jobs/UpdateSearchIndexForEntity.php
@@ -22,10 +22,10 @@ namespace App\Jobs;
use App\Contracts\Searchable;
use App\Jobs\Job;
-use DB;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\DB;
use SerializesModels;
class UpdateSearchIndexForEntity extends Job implements ShouldQueue
diff --git a/app/Jobs/UpdateTagsForRenamedGenre.php b/app/Jobs/UpdateTagsForRenamedGenre.php
index e9623856..df77d4ae 100644
--- a/app/Jobs/UpdateTagsForRenamedGenre.php
+++ b/app/Jobs/UpdateTagsForRenamedGenre.php
@@ -22,12 +22,12 @@ namespace App\Jobs;
use App\Models\Genre;
use App\Models\Track;
-use Auth;
-use Cache;
-use DB;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
-use Log;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
use SerializesModels;
/**
diff --git a/app/Jobs/UpdateTagsForRenamedShowSong.php b/app/Jobs/UpdateTagsForRenamedShowSong.php
index 42e90c36..6f606786 100644
--- a/app/Jobs/UpdateTagsForRenamedShowSong.php
+++ b/app/Jobs/UpdateTagsForRenamedShowSong.php
@@ -22,11 +22,11 @@ namespace App\Jobs;
use App\Models\ShowSong;
use App\Models\Track;
-use Auth;
-use Cache;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
-use Log;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
use SerializesModels;
/**
diff --git a/app/Library/Notifications/Drivers/NativeDriver.php b/app/Library/Notifications/Drivers/NativeDriver.php
index 5920ed13..9c2f32c4 100644
--- a/app/Library/Notifications/Drivers/NativeDriver.php
+++ b/app/Library/Notifications/Drivers/NativeDriver.php
@@ -26,7 +26,7 @@ use App\Models\Comment;
use App\Models\Playlist;
use App\Models\Track;
use App\Models\User;
-use Config;
+use Illuminate\Support\Facades\Config;
use Minishlink\WebPush\WebPush;
class NativeDriver extends AbstractDriver
diff --git a/app/Library/Notifications/Drivers/PonyfmDriver.php b/app/Library/Notifications/Drivers/PonyfmDriver.php
index faa9651c..e12a5605 100644
--- a/app/Library/Notifications/Drivers/PonyfmDriver.php
+++ b/app/Library/Notifications/Drivers/PonyfmDriver.php
@@ -30,8 +30,8 @@ use App\Models\Playlist;
use App\Models\Track;
use App\Models\User;
use Carbon\Carbon;
-use Log;
-use Mail;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
class PonyfmDriver extends AbstractDriver
{
diff --git a/app/Library/Search.php b/app/Library/Search.php
index bb146367..721823b4 100644
--- a/app/Library/Search.php
+++ b/app/Library/Search.php
@@ -24,10 +24,10 @@ use App\Models\Album;
use App\Models\Playlist;
use App\Models\Track;
use App\Models\User;
-use DB;
use Elasticsearch\Client;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\DB;
class Search
{
diff --git a/app/Library/ZipStream.php b/app/Library/ZipStream.php
index f820d3e8..fbd34ed6 100644
--- a/app/Library/ZipStream.php
+++ b/app/Library/ZipStream.php
@@ -557,7 +557,7 @@ class ZipStream
*/
public static function getRelativePath($path)
{
- $path = preg_replace("#/+\.?/+#", '/', str_replace('\\', '/', $path));
+ $path = preg_replace('#/+\\.?/+#', '/', str_replace('\\', '/', $path));
$dirs = explode('/', rtrim(preg_replace('#^(?:\./)+#', '', $path), '/'));
$offset = 0;
diff --git a/app/Library/getid3/demos/demo.mp3header.php b/app/Library/getid3/demos/demo.mp3header.php
index 8d39c927..7b97d9ac 100644
--- a/app/Library/getid3/demos/demo.mp3header.php
+++ b/app/Library/getid3/demos/demo.mp3header.php
@@ -1427,15 +1427,15 @@ if (! function_exists('IsValidURL')) {
if ($parts = safe_parse_url($url)) {
if (($parts['scheme'] != 'http') && ($parts['scheme'] != 'https') && ($parts['scheme'] != 'ftp') && ($parts['scheme'] != 'gopher')) {
return false;
- } elseif (! preg_match("#^[[:alnum:]]([-.]?[0-9a-z])*\.[a-z]{2,3}#i$", $parts['host'], $regs) && ! preg_match('#^[0-9]{1,3}(\.[0-9]{1,3}){3}$#', $parts['host'])) {
+ } elseif (! preg_match('#^[[:alnum:]]([-.]?[0-9a-z])*\\.[a-z]{2,3}#i$', $parts['host'], $regs) && ! preg_match('#^[0-9]{1,3}(\.[0-9]{1,3}){3}$#', $parts['host'])) {
return false;
- } elseif (! preg_match("#^([[:alnum:]-]|[\_])*$#i", $parts['user'], $regs)) {
+ } elseif (! preg_match('#^([[:alnum:]-]|[\\_])*$#i', $parts['user'], $regs)) {
return false;
- } elseif (! preg_match("#^([[:alnum:]-]|[\_])*$#i", $parts['pass'], $regs)) {
+ } elseif (! preg_match('#^([[:alnum:]-]|[\\_])*$#i', $parts['pass'], $regs)) {
return false;
- } elseif (! preg_match("#^[[:alnum:]/_\.@~-]*$#i", $parts['path'], $regs)) {
+ } elseif (! preg_match('#^[[:alnum:]/_\\.@~-]*$#i', $parts['path'], $regs)) {
return false;
- } elseif (! preg_match("#^[[:alnum:]?&=+:;_()%#/,\.-]*$#i", $parts['query'], $regs)) {
+ } elseif (! preg_match('#^[[:alnum:]?&=+:;_()%#/,\\.-]*$#i', $parts['query'], $regs)) {
return false;
} else {
return true;
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index f4eae1af..3c112c43 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -59,7 +59,7 @@ class Activity extends Model
use SoftDeletes;
public $timestamps = false;
- protected $dates = ['created_at'];
+
protected $fillable = ['created_at', 'user_id', 'activity_type', 'resource_type', 'resource_id'];
protected $appends = ['url', 'thumbnail_url', 'human_friendly_resource_type'];
protected $casts = [
diff --git a/app/Models/Album.php b/app/Models/Album.php
index b8b0b8a6..8f396275 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -27,17 +27,17 @@ use App\Exceptions\TrackFileNotFoundException;
use App\Traits\IndexedInElasticsearchTrait;
use App\Traits\SlugTrait;
use App\Traits\TrackCollection;
-use Auth;
-use Cache;
-use DB;
use Exception;
-use Gate;
use Helpers;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
use Venturecraft\Revisionable\RevisionableTrait;
/**
@@ -126,8 +126,6 @@ class Album extends Model implements Searchable, Commentable, Favouritable
return $query;
}
- protected $table = 'albums';
-
public function user()
{
return $this->belongsTo(User::class);
@@ -150,7 +148,7 @@ class Album extends Model implements Searchable, Commentable, Favouritable
public function tracks()
{
- return $this->hasMany(Track::class)->orderBy('track_number', 'asc');
+ return $this->hasMany(Track::class)->orderBy('track_number');
}
public function trackFiles()
@@ -162,7 +160,7 @@ class Album extends Model implements Searchable, Commentable, Favouritable
public function comments():HasMany
{
- return $this->hasMany(Comment::class)->orderBy('created_at', 'desc');
+ return $this->hasMany(Comment::class)->orderByDesc('created_at');
}
public function activities():MorphMany
diff --git a/app/Models/Announcement.php b/app/Models/Announcement.php
index 1ea9bebe..035828fe 100644
--- a/app/Models/Announcement.php
+++ b/app/Models/Announcement.php
@@ -49,8 +49,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class Announcement extends Model
{
- protected $table = 'announcements';
-
protected $casts = [
'links' => 'array',
'tracks' => 'array',
diff --git a/app/Models/Comment.php b/app/Models/Comment.php
index 632b3612..2ea7c1f8 100644
--- a/app/Models/Comment.php
+++ b/app/Models/Comment.php
@@ -21,10 +21,10 @@
namespace App\Models;
use App\Contracts\Commentable;
-use DB;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\DB;
/**
* App\Models\Comment.
@@ -70,8 +70,6 @@ class Comment extends Model
{
use SoftDeletes;
- protected $table = 'comments';
-
public function user()
{
return $this->belongsTo(User::class);
diff --git a/app/Models/Favourite.php b/app/Models/Favourite.php
index 33df34d8..8029c84d 100644
--- a/app/Models/Favourite.php
+++ b/app/Models/Favourite.php
@@ -47,7 +47,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class Favourite extends Model
{
- protected $table = 'favourites';
public $timestamps = false;
/*
diff --git a/app/Models/Follower.php b/app/Models/Follower.php
index 70e7f364..1a9128f9 100644
--- a/app/Models/Follower.php
+++ b/app/Models/Follower.php
@@ -42,8 +42,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
*/
class Follower extends Model
{
- protected $table = 'followers';
-
public $timestamps = false;
public function follower():BelongsTo
diff --git a/app/Models/Genre.php b/app/Models/Genre.php
index 291c56e2..3d74ebf5 100644
--- a/app/Models/Genre.php
+++ b/app/Models/Genre.php
@@ -21,11 +21,11 @@
namespace App\Models;
use App\Traits\SlugTrait;
-use DB;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\DB;
use Venturecraft\Revisionable\RevisionableTrait;
/**
@@ -60,8 +60,6 @@ class Genre extends Model
{
use HasFactory;
- protected $table = 'genres';
-
protected $fillable = ['name', 'slug'];
protected $appends = ['track_count', 'url'];
protected $hidden = ['trackCountRelation'];
diff --git a/app/Models/Image.php b/app/Models/Image.php
index d8c0de3f..68b3c49a 100644
--- a/app/Models/Image.php
+++ b/app/Models/Image.php
@@ -20,9 +20,9 @@
namespace App\Models;
-use Config;
use External;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
@@ -165,8 +165,6 @@ class Image extends Model
chmod($path, 0644);
}
- protected $table = 'images';
-
public function getUrl($type = self::NORMAL)
{
$type = self::$ImageTypes[$type];
diff --git a/app/Models/License.php b/app/Models/License.php
index 8ac97b15..ded04d92 100644
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -41,5 +41,4 @@ use Illuminate\Database\Eloquent\Model;
*/
class License extends Model
{
- protected $table = 'licenses';
}
diff --git a/app/Models/Notification.php b/app/Models/Notification.php
index 24b950ff..24cff7d9 100644
--- a/app/Models/Notification.php
+++ b/app/Models/Notification.php
@@ -84,7 +84,7 @@ class Notification extends Model
->where('notifications.user_id', $user->id)
->whereNull('activities.deleted_at')
->select('*', 'notifications.id as id')
- ->orderBy('activities.created_at', 'DESC');
+ ->orderByDesc('activities.created_at');
return $result;
}
diff --git a/app/Models/PinnedPlaylist.php b/app/Models/PinnedPlaylist.php
index 00a6f316..e733fc68 100644
--- a/app/Models/PinnedPlaylist.php
+++ b/app/Models/PinnedPlaylist.php
@@ -41,8 +41,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class PinnedPlaylist extends Model
{
- protected $table = 'pinned_playlists';
-
public function user()
{
return $this->belongsTo(User::class);
diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php
index 7f0ba299..88decf11 100644
--- a/app/Models/Playlist.php
+++ b/app/Models/Playlist.php
@@ -27,15 +27,15 @@ use App\Exceptions\TrackFileNotFoundException;
use App\Traits\IndexedInElasticsearchTrait;
use App\Traits\SlugTrait;
use App\Traits\TrackCollection;
-use Auth;
-use Cache;
-use DB;
use Helpers;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
use Venturecraft\Revisionable\RevisionableTrait;
/**
@@ -94,8 +94,6 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
protected $elasticsearchType = 'playlist';
- protected $table = 'playlists';
-
protected $casts = [
'id' => 'integer',
'user_id' => 'integer',
@@ -244,7 +242,7 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
->withTimestamps();
if ($ordered) {
- $query = $query->orderBy('position', 'asc');
+ $query = $query->orderBy('position');
}
return $query;
@@ -269,7 +267,7 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
public function comments():HasMany
{
- return $this->hasMany(Comment::class)->orderBy('created_at', 'desc');
+ return $this->hasMany(Comment::class)->orderByDesc('created_at');
}
public function pins()
diff --git a/app/Models/ResourceLogItem.php b/app/Models/ResourceLogItem.php
index 40f16e49..4c37a930 100644
--- a/app/Models/ResourceLogItem.php
+++ b/app/Models/ResourceLogItem.php
@@ -20,11 +20,11 @@
namespace App\Models;
-use Auth;
use Carbon\Carbon;
-use DB;
use Illuminate\Database\Eloquent\Model;
-use Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Request;
/**
* App\Models\ResourceLogItem.
@@ -51,9 +51,7 @@ use Request;
*/
class ResourceLogItem extends Model
{
- protected $table = 'resource_log_items';
public $timestamps = false;
- protected $dates = ['created_at'];
const VIEW = 1;
const DOWNLOAD = 2;
diff --git a/app/Models/ResourceUser.php b/app/Models/ResourceUser.php
index 68614c27..df943f4d 100644
--- a/app/Models/ResourceUser.php
+++ b/app/Models/ResourceUser.php
@@ -53,7 +53,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class ResourceUser extends Model
{
- protected $table = 'resource_users';
public $timestamps = false;
public static function get($userId, $resourceType, $resourceId)
diff --git a/app/Models/Role.php b/app/Models/Role.php
index 6f208f13..785aded6 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class Role extends Model
{
- protected $table = 'roles';
public $timestamps = false;
public function users()
diff --git a/app/Models/ShowSong.php b/app/Models/ShowSong.php
index b277347e..5e43e2ed 100644
--- a/app/Models/ShowSong.php
+++ b/app/Models/ShowSong.php
@@ -20,8 +20,8 @@
namespace App\Models;
-use DB;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
/**
* App\Models\ShowSong.
@@ -46,7 +46,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class ShowSong extends Model
{
- protected $table = 'show_songs';
protected $fillable = ['title', 'slug', 'lyrics'];
public function trackCountRelation()
diff --git a/app/Models/Track.php b/app/Models/Track.php
index c4729972..c2499b42 100644
--- a/app/Models/Track.php
+++ b/app/Models/Track.php
@@ -27,13 +27,8 @@ use App\Exceptions\TrackFileNotFoundException;
use App\Models\ResourceLogItem;
use App\Traits\IndexedInElasticsearchTrait;
use App\Traits\SlugTrait;
-use Auth;
-use Cache;
-use Config;
-use DB;
use Exception;
use External;
-use Gate;
use getid3_writetags;
use Helpers;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -41,8 +36,13 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
-use Log;
use Venturecraft\Revisionable\RevisionableTrait;
/**
@@ -154,11 +154,10 @@ class Track extends Model implements Searchable, Commentable, Favouritable
protected $elasticsearchType = 'track';
- protected $dates = [
- 'published_at', 'released_at',
- ];
protected $hidden = ['original_tags', 'metadata'];
protected $casts = [
+ 'published_at' => 'datetime',
+ 'released_at' => 'datetime',
'id' => 'integer',
'user_id' => 'integer',
'license_id' => 'integer',
@@ -692,8 +691,6 @@ class Track extends Model implements Searchable, Commentable, Favouritable
];
}
- protected $table = 'tracks';
-
public function genre()
{
return $this->belongsTo(Genre::class);
@@ -706,7 +703,7 @@ class Track extends Model implements Searchable, Commentable, Favouritable
public function comments():HasMany
{
- return $this->hasMany(Comment::class)->orderBy('created_at', 'desc');
+ return $this->hasMany(Comment::class)->orderByDesc('created_at');
}
public function favourites():HasMany
diff --git a/app/Models/TrackFile.php b/app/Models/TrackFile.php
index a5a3f425..3ff857f9 100644
--- a/app/Models/TrackFile.php
+++ b/app/Models/TrackFile.php
@@ -20,11 +20,11 @@
namespace App\Models;
-use App;
-use Config;
-use File;
use Helpers;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\File;
/**
* App\Models\TrackFile.
@@ -67,8 +67,9 @@ class TrackFile extends Model
const STATUS_PROCESSING_PENDING = 3;
protected $appends = ['is_expired'];
- protected $dates = ['expires_at'];
+
protected $casts = [
+ 'expires_at' => 'datetime',
'id' => 'integer',
'track_id' => 'integer',
'is_master' => 'boolean',
diff --git a/app/Models/TrackType.php b/app/Models/TrackType.php
index 0240f260..e7b85bd8 100644
--- a/app/Models/TrackType.php
+++ b/app/Models/TrackType.php
@@ -35,8 +35,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class TrackType extends Model
{
- protected $table = 'track_types';
-
const ORIGINAL_TRACK = 1;
const OFFICIAL_TRACK_REMIX = 2;
const FAN_TRACK_REMIX = 3;
diff --git a/app/Models/User.php b/app/Models/User.php
index b4511177..7253e0e4 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -23,9 +23,7 @@ namespace App\Models;
use App\Contracts\Commentable;
use App\Contracts\Searchable;
use App\Traits\IndexedInElasticsearchTrait;
-use Auth;
use Carbon\Carbon;
-use DB;
use Gravatar;
use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\Passwords\CanResetPassword;
@@ -36,9 +34,11 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Foundation\Auth\Access\Authorizable;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use League\OAuth2\Client\Token\AccessToken;
-use Validator;
use Venturecraft\Revisionable\RevisionableTrait;
/**
@@ -109,9 +109,8 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
use Authenticatable, CanResetPassword, Authorizable, RevisionableTrait, IndexedInElasticsearchTrait;
protected $elasticsearchType = 'user';
-
- protected $table = 'users';
protected $casts = [
+ 'disabled_at' => 'datetime',
'id' => 'integer',
'sync_names' => 'boolean',
'uses_gravatar' => 'boolean',
@@ -122,7 +121,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
'is_archived' => 'boolean',
'redirect_to' => 'integer',
];
- protected $dates = ['created_at', 'updated_at', 'disabled_at'];
+
protected $hidden = ['disabled_at', 'remember_token'];
public function scopeUserDetails($query)
@@ -312,7 +311,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
public function comments():HasMany
{
- return $this->hasMany(Comment::class, 'profile_id')->orderBy('created_at', 'desc');
+ return $this->hasMany(Comment::class, 'profile_id')->orderByDesc('created_at');
}
public function tracks()
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 0dcb6bc2..aadae502 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -22,10 +22,10 @@ namespace App\Providers;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\ServiceProvider;
use PfmValidator;
use Poniverse;
-use Validator;
class AppServiceProvider extends ServiceProvider
{
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 6517847e..835a6882 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -30,9 +30,9 @@ use App\Policies\GenrePolicy;
use App\Policies\ShowSongPolicy;
use App\Policies\TrackPolicy;
use App\Policies\UserPolicy;
-use Gate;
use Illuminate\Contracts\Auth\Access\Gate as GateContract;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Gate;
class AuthServiceProvider extends ServiceProvider
{
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 1f80b4e2..1d3efe80 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -37,15 +37,7 @@ class RouteServiceProvider extends ServiceProvider
* @var string
*/
public const HOME = '/home';
-
- /**
- * The controller namespace for the application.
- *
- * When present, controller route declarations will automatically be prefixed with this namespace.
- *
- * @var string|null
- */
- // protected $namespace = 'App\\Http\\Controllers';
+ //
/**
* Define your route model bindings, pattern filters, etc.
@@ -64,11 +56,9 @@ class RouteServiceProvider extends ServiceProvider
Route::prefix('api')
->middleware('api')
- ->namespace($this->namespace)
->group(base_path('routes/api.php'));
Route::middleware('web')
- ->namespace($this->namespace)
->group(base_path('routes/web.php'));
});
}
diff --git a/app/Traits/IndexedInElasticsearchTrait.php b/app/Traits/IndexedInElasticsearchTrait.php
index 38a932dc..5c1e951d 100644
--- a/app/Traits/IndexedInElasticsearchTrait.php
+++ b/app/Traits/IndexedInElasticsearchTrait.php
@@ -22,10 +22,10 @@ namespace App\Traits;
use App\Contracts\Searchable;
use App\Jobs\UpdateSearchIndexForEntity;
-use Config;
use Elasticsearch;
use Elasticsearch\Common\Exceptions\Missing404Exception;
use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Config;
/**
* Class IndexedInElasticsearch.
diff --git a/app/Traits/TrackCollection.php b/app/Traits/TrackCollection.php
index b81a6f42..81655493 100644
--- a/app/Traits/TrackCollection.php
+++ b/app/Traits/TrackCollection.php
@@ -24,11 +24,11 @@ namespace App\Traits;
use App\Jobs\EncodeTrackFile;
use App\Models\Track;
use App\Models\TrackFile;
-use File;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\File;
/**
* Class TrackCollection.
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 7c503448..2b54fac7 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -53,7 +53,7 @@
- @if (Auth::check())
+ @auth
- @endif
+ @endauth