diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php index fb61be53..a494d28c 100644 --- a/app/Http/Controllers/Api/Web/AlbumsController.php +++ b/app/Http/Controllers/Api/Web/AlbumsController.php @@ -21,18 +21,16 @@ namespace Poniverse\Ponyfm\Http\Controllers\Api\Web; use Illuminate\Database\Eloquent\ModelNotFoundException; -use Illuminate\Support\Facades\File; use Poniverse\Ponyfm\Models\Album; use Poniverse\Ponyfm\Commands\CreateAlbumCommand; use Poniverse\Ponyfm\Commands\DeleteAlbumCommand; use Poniverse\Ponyfm\Commands\EditAlbumCommand; use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; use Poniverse\Ponyfm\Models\Image; -use Poniverse\Ponyfm\Jobs\EncodeTrackFile; use Poniverse\Ponyfm\Models\ResourceLogItem; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Input; -use Illuminate\Support\Facades\Response; +use Auth; +use Input; +use Response; use Poniverse\Ponyfm\Models\Track; class AlbumsController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/PlaylistsController.php b/app/Http/Controllers/Api/Web/PlaylistsController.php index e3b92e76..c0ee2c0b 100644 --- a/app/Http/Controllers/Api/Web/PlaylistsController.php +++ b/app/Http/Controllers/Api/Web/PlaylistsController.php @@ -29,9 +29,9 @@ use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; use Poniverse\Ponyfm\Models\Image; use Poniverse\Ponyfm\Models\Playlist; use Poniverse\Ponyfm\Models\ResourceLogItem; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Input; -use Illuminate\Support\Facades\Response; +use Auth; +use Input; +use Response; use Poniverse\Ponyfm\Models\Track; class PlaylistsController extends ApiControllerBase diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php index 123387ec..ad696c5b 100644 --- a/app/Http/Controllers/Api/Web/TracksController.php +++ b/app/Http/Controllers/Api/Web/TracksController.php @@ -22,13 +22,12 @@ namespace Poniverse\Ponyfm\Http\Controllers\Api\Web; use Illuminate\Database\Eloquent\ModelNotFoundException; use File; -use Poniverse\Ponyfm\Exceptions\InvalidEncodeOptionsException; use Poniverse\Ponyfm\Commands\DeleteTrackCommand; use Poniverse\Ponyfm\Commands\EditTrackCommand; use Poniverse\Ponyfm\Commands\UploadTrackCommand; use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; use Poniverse\Ponyfm\Jobs\EncodeTrackFile; -use Poniverse\Ponyfm\ResourceLogItem; +use Poniverse\Ponyfm\Models\ResourceLogItem; use Poniverse\Ponyfm\Models\TrackFile; use Poniverse\Ponyfm\Models\Track; use Auth; diff --git a/app/Library/CacheBusterAsset.php b/app/Library/CacheBusterAsset.php deleted file mode 100644 index 707088cd..00000000 --- a/app/Library/CacheBusterAsset.php +++ /dev/null @@ -1,55 +0,0 @@ -. - */ - -use Assetic\Asset\BaseAsset; -use Assetic\Filter\FilterInterface; - -/** - * Class CacheBusterAsset - * OH GOD IT BUUUUUUURNS - * - * Well, I may as well tell you why this awful class exists. So... Assetic doesn't quite support less's import - * directive. I mean; it supports it insofar as Less itself supports it - but it doesn't take into account the - * last modified time for imported assets. Since we only have one less file that imports everything else... well - * you can see where this is going. This asset will let us override the last modified time for an entire collection - * which allows me to write a custom mechanism for cache busting. - */ -class CacheBusterAsset extends BaseAsset -{ - private $_lastModified; - - /** - * @param int $lastModified - */ - public function __construct($lastModified) - { - $this->_lastModified = $lastModified; - parent::__construct([], '', '', []); - } - - public function load(FilterInterface $additionalFilter = null) - { - } - - public function getLastModified() - { - return $this->_lastModified; - } -}