Merge branch 'master' into feature/cache_tracks

app/Console/Commands/RebuildArtists.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Poniverse\Ponyfm\Console\Commands;
+
+use Illuminate\Console\Command;
+use Poniverse\Ponyfm\User;
+
+class RebuildArtists extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'rebuild:artists';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Recounts every user\'s tracks, ensuring that the artist directory isn\'t missing anyone.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        foreach(User::with(['tracks' => function($query) {
+            $query->published()->listed();
+        }])->get() as $user) {
+            $user->track_count = $user->tracks->count();
+            $user->save();
+            $this->info('Updated user #'.$user->id.'!');
+        }
+    }
+}

app/Console/Kernel.php

@@ -37,6 +37,7 @@ class Kernel extends ConsoleKernel
         \Poniverse\Ponyfm\Console\Commands\ClassifyMLPMA::class,
         \Poniverse\Ponyfm\Console\Commands\PublishUnclassifiedMlpmaTracks::class,
         \Poniverse\Ponyfm\Console\Commands\RebuildTags::class,
+        \Poniverse\Ponyfm\Console\Commands\RebuildArtists::class,
         \Poniverse\Ponyfm\Console\Commands\FixYearZeroLogs::class,
         \Poniverse\Ponyfm\Console\Commands\BootstrapLocalEnvironment::class,
         \Poniverse\Ponyfm\Console\Commands\PoniverseApiSetup::class,

app/Http/Controllers/PlaylistsController.php

@@ -63,7 +63,7 @@ class PlaylistsController extends Controller
     public function getDownload($id, $extension)
     {
         $playlist = Playlist::with('tracks', 'user', 'tracks.album')->find($id);
-        if (!$playlist || !$playlist->is_public) {
+        if (!$playlist || (!$playlist->is_public && !Auth::check()) || (!$playlist->is_public && ($playlist->user_id !== Auth::user()->id))) {
             App::abort(404);
         }
 

app/User.php

@@ -66,6 +66,11 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         return $this->hasMany('Poniverse\Ponyfm\Comment', 'profile_id')->orderBy('created_at', 'desc');
     }
 
+    public function tracks()
+    {
+        return $this->hasMany('Poniverse\Ponyfm\Track', 'user_id');
+    }
+
     public function getIsArchivedAttribute()
     {
         return (bool)$this->attributes['is_archived'];