PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-03-31 16:25:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #89 from Poniverse/scrutinizer-patch-1

Browse source 
Scrutinizer Auto-Fixes
This commit is contained in:
Peter Deltchev 2016-06-05 23:30:26 -07:00
commit b334e51928
43 changed files with 165 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Commands/EditTrackCommand.php
View file

@ -27,7 +27,6 @@ use Poniverse\Ponyfm\Models\Image;
use Poniverse\Ponyfm\Models\Track;
use Poniverse\Ponyfm\Models\TrackType;
use Poniverse\Ponyfm\Models\User;
use Auth;
use DB;
class EditTrackCommand extends CommandBase

1
app/Commands/GenerateTrackFilesCommand.php
View file

@ -30,7 +30,6 @@ use AudioCache;
use File;
use Illuminate\Support\Str;
use SplFileInfo;
use Validator;
/**
* This command is the "second phase" of the upload process - once metadata has

2
app/Commands/ParseTrackTagsCommand.php
View file

@ -119,7 +119,7 @@ class ParseTrackTagsCommand extends CommandBase
*
* @param int $artistId
* @param string|null $albumName
* @param null $coverId
* @param integer|null $coverId
* @return int|null
*/
protected function getAlbumId(int $artistId, $albumName, $coverId = null) {

1
app/Console/Commands/RebuildSearchIndex.php
View file

@ -26,7 +26,6 @@ use Poniverse\Ponyfm\Models\Album;
use Poniverse\Ponyfm\Models\Playlist;
use Poniverse\Ponyfm\Models\Track;
use Poniverse\Ponyfm\Models\User;
use Symfony\Component\Console\Helper\ProgressBar;
class RebuildSearchIndex extends Command
{

6
app/Http/Controllers/Api/Web/TracksController.php
View file

@ -99,11 +99,13 @@ class TracksController extends ApiControllerBase
return $this->notFound('Track not found!');
}
if (!$track->canView(Auth::user()))
if (!$track->canView(Auth::user())) {
return $this->notFound('Track not found!');
}
if ($track->is_downloadable == false)
if ($track->is_downloadable == false) {
return $this->notFound('Track not found!');
}
if (!in_array($format, Track::$CacheableFormats)) {
return $this->notFound('Format not found!');

3
app/Models/Album.php
View file

@ -398,6 +398,9 @@ class Album extends Model implements Searchable, Commentable, Favouritable
}
}
/**
* @param string $key
*/
public function getCacheKey($key)
{
return 'album-'.$this->id.'-'.$key;

1
app/Models/Comment.php
View file

@ -24,7 +24,6 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Poniverse\Ponyfm\Contracts\Commentable;
use Poniverse\Ponyfm\Contracts\GeneratesNotifications;
/**
* Poniverse\Ponyfm\Models\Comment