Shift cleanup

app/Commands/CreateGenreCommand.php

@@ -22,8 +22,8 @@ namespace App\Commands;
 
 use App\Models\Genre;
 use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 
 class CreateGenreCommand extends CommandBase
 {

app/Commands/CreateShowSongCommand.php

@@ -22,8 +22,8 @@ namespace App\Commands;
 
 use App\Models\ShowSong;
 use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 
 class CreateShowSongCommand extends CommandBase
 {

app/Commands/DeleteGenreCommand.php

@@ -22,8 +22,8 @@ namespace App\Commands;
 
 use App\Jobs\DeleteGenre;
 use App\Models\Genre;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 
 class DeleteGenreCommand extends CommandBase

app/Commands/DeleteShowSongCommand.php

@@ -22,8 +22,8 @@ namespace App\Commands;
 
 use App\Jobs\DeleteShowSong;
 use App\Models\ShowSong;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 
 class DeleteShowSongCommand extends CommandBase

app/Commands/GenerateTrackFilesCommand.php

@@ -26,8 +26,8 @@ use App\Models\Track;
 use App\Models\TrackFile;
 use AudioCache;
 use FFmpegMovie;
-use Illuminate\Support\Facades\File;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use SplFileInfo;
 

app/Commands/ParseTrackTagsCommand.php

@@ -28,9 +28,9 @@ use App\Models\TrackType;
 use App\Models\User;
 use AudioCache;
 use Carbon\Carbon;
+use getID3;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
-use getID3;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;

app/Commands/RenameGenreCommand.php

@@ -22,10 +22,10 @@ namespace App\Commands;
 
 use App\Jobs\UpdateTagsForRenamedGenre;
 use App\Models\Genre;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 
 class RenameGenreCommand extends CommandBase
 {

app/Commands/RenameShowSongCommand.php

@@ -22,10 +22,10 @@ namespace App\Commands;
 
 use App\Jobs\UpdateTagsForRenamedShowSong;
 use App\Models\ShowSong;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 
 class RenameShowSongCommand extends CommandBase
 {

app/Commands/UploadTrackCommand.php

@@ -22,11 +22,11 @@ namespace App\Commands;
 
 use App\Models\Track;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Gate;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Validator;
 

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 Illuminate\Support\Facades\DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
 class ClassifyMLPMA extends Command

app/Console/Commands/ClearTrackCache.php

@@ -22,8 +22,8 @@ namespace App\Console\Commands;
 
 use App\Models\TrackFile;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\File;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
 
 class ClearTrackCache extends Command
 {

app/Console/Commands/FixMLPMAImages.php

@@ -21,11 +21,11 @@
 namespace App\Console\Commands;
 
 use App\Models\Image;
+use getID3;
+use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
-use getID3;
-use Illuminate\Console\Command;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class FixMLPMAImages extends Command

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 Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
+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 getID3;
-use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 use Input;
 use Symfony\Component\HttpFoundation\File\UploadedFile;

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 Illuminate\Support\Facades\DB;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 
 class MergeAccounts extends Command
 {

app/Console/Commands/MigrateOldData.php

@@ -22,9 +22,9 @@ namespace App\Console\Commands;
 
 use App\Models\Image;
 use App\Models\ResourceLogItem;
-use Illuminate\Support\Facades\DB;
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class MigrateOldData extends Command

app/Console/Commands/RebuildFilesizes.php

@@ -21,8 +21,8 @@
 namespace App\Console\Commands;
 
 use App\Models\TrackFile;
-use Illuminate\Support\Facades\File;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
 
 class RebuildFilesizes extends Command
 {

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 Illuminate\Support\Facades\File;
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\File;
 
 class RebuildTrackCache extends Command
 {

app/Console/Commands/RefreshCache.php

@@ -21,8 +21,8 @@
 namespace App\Console\Commands;
 
 use App\Models\ResourceLogItem;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 
 class RefreshCache extends Command
 {

app/Console/Commands/VersionFiles.php

@@ -21,8 +21,8 @@
 namespace App\Console\Commands;
 
 use App\Models\TrackFile;
-use Illuminate\Support\Facades\File;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
 
 class VersionFiles extends Command
 {

app/Http/Controllers/AlbumsController.php

@@ -20,11 +20,11 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\App;
 use App\AlbumDownloader;
 use App\Models\Album;
 use App\Models\ResourceLogItem;
 use App\Models\Track;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 

app/Http/Controllers/Api/Web/AccountController.php

@@ -20,11 +20,11 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\SaveAccountSettingsCommand;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\Image;
 use App\Models\User;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Response;

app/Http/Controllers/Api/Web/AlbumsController.php

@@ -20,7 +20,6 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\CreateAlbumCommand;
 use App\Commands\DeleteAlbumCommand;
 use App\Commands\EditAlbumCommand;
@@ -30,9 +29,10 @@ use App\Models\Image;
 use App\Models\ResourceLogItem;
 use App\Models\Track;
 use App\Models\User;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\Response;
 
 class AlbumsController extends ApiControllerBase

app/Http/Controllers/Api/Web/AnnouncementsController.php

@@ -20,11 +20,11 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\CreateAnnouncementCommand;
 use App\Http\Controllers\Controller;
 use App\Models\Announcement;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 
 class AnnouncementsController extends Controller

app/Http/Controllers/Api/Web/ArtistsController.php

@@ -20,8 +20,6 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use App\Commands\CreateUserCommand;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\Album;
@@ -32,8 +30,10 @@ use App\Models\Image;
 use App\Models\Track;
 use App\Models\User;
 use ColorThief\ColorThief;
-use Illuminate\Support\Facades\Gate;
 use Helpers;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Response;
 
 class ArtistsController extends ApiControllerBase

app/Http/Controllers/Api/Web/CommentsController.php

@@ -20,11 +20,11 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use App\Commands\CreateCommentCommand;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\Comment;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Response;
 
 class CommentsController extends ApiControllerBase

app/Http/Controllers/Api/Web/DashboardController.php

@@ -20,9 +20,9 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\Track;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Response;
 

app/Http/Controllers/Api/Web/FavouritesController.php

@@ -20,13 +20,13 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\ToggleFavouriteCommand;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\Album;
 use App\Models\Favourite;
 use App\Models\Playlist;
 use App\Models\Track;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Response;
 

app/Http/Controllers/Api/Web/FollowController.php

@@ -20,9 +20,9 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\ToggleFollowingCommand;
 use App\Http\Controllers\ApiControllerBase;
+use Illuminate\Http\Request;
 
 class FollowController extends ApiControllerBase
 {

app/Http/Controllers/Api/Web/GenresController.php

@@ -20,12 +20,12 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\CreateGenreCommand;
 use App\Commands\DeleteGenreCommand;
 use App\Commands\RenameGenreCommand;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\Genre;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 
 class GenresController extends ApiControllerBase

app/Http/Controllers/Api/Web/NotificationsController.php

@@ -20,12 +20,12 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\Notification;
 use App\Models\Subscription;
 use App\Models\Track;
 use App\Models\User;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Minishlink\WebPush\WebPush;
 

app/Http/Controllers/Api/Web/PlaylistsController.php

@@ -20,7 +20,6 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\AddTrackToPlaylistCommand;
 use App\Commands\CreatePlaylistCommand;
 use App\Commands\DeletePlaylistCommand;
@@ -32,8 +31,9 @@ use App\Models\Playlist;
 use App\Models\ResourceLogItem;
 use App\Models\Track;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Response;
 
 class PlaylistsController extends ApiControllerBase

app/Http/Controllers/Api/Web/SearchController.php

@@ -20,10 +20,10 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\ApiControllerBase;
 use App\Library\Search;
 use Elasticsearch;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 
 class SearchController extends ApiControllerBase

app/Http/Controllers/Api/Web/ShowSongsController.php

@@ -20,12 +20,12 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\CreateShowSongCommand;
 use App\Commands\DeleteShowSongCommand;
 use App\Commands\RenameShowSongCommand;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\ShowSong;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 
 class ShowSongsController extends ApiControllerBase

app/Http/Controllers/Api/Web/StatsController.php

@@ -20,17 +20,17 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\ApiControllerBase;
 use App\Models\ResourceLogItem;
 use App\Models\Track;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
-use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Str;
 
 class StatsController extends ApiControllerBase
 {

app/Http/Controllers/Api/Web/TracksController.php

@@ -20,7 +20,6 @@
 
 namespace App\Http\Controllers\Api\Web;
 
-use Illuminate\Http\Request;
 use App\Commands\DeleteTrackCommand;
 use App\Commands\EditTrackCommand;
 use App\Commands\GenerateTrackFilesCommand;
@@ -33,9 +32,10 @@ use App\Models\Track;
 use App\Models\TrackFile;
 use App\Models\TrackType;
 use App\Models\User;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\File;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\Response;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 

app/Http/Controllers/ArtistsController.php

@@ -20,8 +20,8 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\App;
 use App\Models\User;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;
 

app/Http/Controllers/AuthController.php

@@ -20,17 +20,17 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Models\Activity;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
+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 Illuminate\Support\Facades\Log;
 use Poniverse\Lib\Client;
-use Illuminate\Support\Facades\Redirect;
 
 class AuthController extends Controller
 {

app/Http/Controllers/ImagesController.php

@@ -20,8 +20,8 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\App;
 use App\Models\Image;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Response;

app/Http/Controllers/NotificationsController.php

@@ -20,10 +20,10 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use App\Models\Email;
 use App\Models\EmailSubscription;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\View;

app/Http/Controllers/PlaylistsController.php

@@ -20,12 +20,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use App\Models\Playlist;
 use App\Models\ResourceLogItem;
 use App\Models\Track;
 use App\PlaylistDownloader;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\View;

app/Http/Controllers/TracksController.php

@@ -20,13 +20,13 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\App;
 use App\Models\ResourceLogItem;
 use App\Models\Track;
 use App\Models\TrackFile;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\View;

app/Http/Middleware/Authorize.php

@@ -21,8 +21,8 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Support\Facades\Gate;
 
 class Authorize
 {

app/Jobs/DeleteGenre.php

@@ -22,10 +22,10 @@ namespace App\Jobs;
 
 use App\Models\Genre;
 use App\Models\Track;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\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

app/Jobs/DeleteShowSong.php

@@ -22,10 +22,10 @@ namespace App\Jobs;
 
 use App\Models\ShowSong;
 use App\Models\Track;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\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

app/Jobs/EncodeTrackFile.php

@@ -25,12 +25,12 @@ use App\Exceptions\InvalidEncodeOptionsException;
 use App\Models\Track;
 use App\Models\TrackFile;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\File;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+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;

app/Jobs/Job.php

@@ -20,9 +20,9 @@
 
 namespace App\Jobs;
 
+use Illuminate\Bus\Queueable;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Bus\Queueable;
 
 abstract class Job
 {

app/Jobs/UpdateSearchIndexForEntity.php

@@ -22,10 +22,10 @@ namespace App\Jobs;
 
 use App\Contracts\Searchable;
 use App\Jobs\Job;
-use Illuminate\Support\Facades\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

app/Jobs/UpdateTagsForRenamedGenre.php

@@ -22,11 +22,11 @@ namespace App\Jobs;
 
 use App\Models\Genre;
 use App\Models\Track;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Log;
 use SerializesModels;
 

app/Jobs/UpdateTagsForRenamedShowSong.php

@@ -22,10 +22,10 @@ namespace App\Jobs;
 
 use App\Models\ShowSong;
 use App\Models\Track;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use SerializesModels;
 

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 Illuminate\Support\Facades\DB;
 use Elasticsearch\Client;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\DB;
 
 class Search
 {

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 Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 use Exception;
-use Illuminate\Support\Facades\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;
 
 /**

app/Models/Announcement.php

@@ -49,7 +49,6 @@ use Illuminate\Database\Eloquent\Model;
  */
 class Announcement extends Model
 {
-
     protected $casts = [
         'links' => 'array',
         'tracks' => 'array',

app/Models/Comment.php

@@ -21,10 +21,10 @@
 namespace App\Models;
 
 use App\Contracts\Commentable;
-use Illuminate\Support\Facades\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.

app/Models/Follower.php

@@ -42,7 +42,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  */
 class Follower extends Model
 {
-
     public $timestamps = false;
 
     public function follower():BelongsTo

app/Models/Genre.php

@@ -21,11 +21,11 @@
 namespace App\Models;
 
 use App\Traits\SlugTrait;
-use Illuminate\Support\Facades\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;
 
 /**

app/Models/Image.php

@@ -20,9 +20,9 @@
 
 namespace App\Models;
 
-use Illuminate\Support\Facades\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;

app/Models/PinnedPlaylist.php

@@ -41,7 +41,6 @@ use Illuminate\Database\Eloquent\Model;
  */
 class PinnedPlaylist extends Model
 {
-
     public function user()
     {
         return $this->belongsTo(User::class);

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 Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\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;
 
 /**

app/Models/ResourceLogItem.php

@@ -20,10 +20,10 @@
 
 namespace App\Models;
 
-use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Request;
 
 /**
@@ -53,7 +53,6 @@ class ResourceLogItem extends Model
 {
     public $timestamps = false;
 
-
     const VIEW = 1;
     const DOWNLOAD = 2;
     const PLAY = 3;

app/Models/ShowSong.php

@@ -20,8 +20,8 @@
 
 namespace App\Models;
 
-use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 
 /**
  * App\Models\ShowSong.

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 Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\DB;
 use Exception;
 use External;
-use Illuminate\Support\Facades\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\Str;
+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 Venturecraft\Revisionable\RevisionableTrait;
 
 /**

app/Models/TrackFile.php

@@ -20,11 +20,11 @@
 
 namespace App\Models;
 
+use Helpers;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
-use Helpers;
-use Illuminate\Database\Eloquent\Model;
 
 /**
  * App\Models\TrackFile.

app/Models/TrackType.php

@@ -35,7 +35,6 @@ use Illuminate\Database\Eloquent\Model;
  */
 class TrackType extends Model
 {
-
     const ORIGINAL_TRACK = 1;
     const OFFICIAL_TRACK_REMIX = 2;
     const FAN_TRACK_REMIX = 3;

app/Models/User.php

@@ -23,9 +23,7 @@ namespace App\Models;
 use App\Contracts\Commentable;
 use App\Contracts\Searchable;
 use App\Traits\IndexedInElasticsearchTrait;
-use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\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 Illuminate\Support\Facades\Validator;
 use Venturecraft\Revisionable\RevisionableTrait;
 
 /**

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 Illuminate\Support\Facades\Validator;
 
 class AppServiceProvider extends ServiceProvider
 {

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 Illuminate\Support\Facades\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
 {

app/Traits/IndexedInElasticsearchTrait.php

@@ -22,10 +22,10 @@ namespace App\Traits;
 
 use App\Contracts\Searchable;
 use App\Jobs\UpdateSearchIndexForEntity;
-use Illuminate\Support\Facades\Config;
 use Elasticsearch;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Class IndexedInElasticsearch.

app/Traits/TrackCollection.php

@@ -24,11 +24,11 @@ namespace App\Traits;
 use App\Jobs\EncodeTrackFile;
 use App\Models\Track;
 use App\Models\TrackFile;
-use Illuminate\Support\Facades\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.