Merge pull request #3319 from pixelfed/staging

Staging

app/Console/Commands/MediaGarbageCollector.php

@@ -5,62 +5,56 @@ namespace App\Console\Commands;
 use Illuminate\Console\Command;
 use App\{Media, Status};
 use Carbon\Carbon;
+use App\Services\MediaStorageService;
 
 class MediaGarbageCollector extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'media:gc';
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'media:gc';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Delete media uploads not attached to any active statuses';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Delete media uploads not attached to any active statuses';
 
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $limit = 20000;
-        
-        $gc = Media::doesntHave('status')
-        ->where('created_at', '<', Carbon::now()->subHours(1)->toDateTimeString())
-        ->orderBy('created_at','asc')
-        ->take($limit)
-        ->get();
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$limit = 20000;
 
-        $bar = $this->output->createProgressBar($gc->count());
-        $bar->start();
-        foreach($gc as $media) {
-            $path = storage_path("app/$media->media_path");
-            $thumb = storage_path("app/$media->thumbnail_path");
-            if(is_file($path)) {
-                unlink($path);
-            }
-            if(is_file($thumb)) {
-                unlink($thumb);
-            }
-            $media->forceDelete();
-            $bar->advance();
-        }
-        $bar->finish();
-    }
+		$gc = Media::whereNull('status_id')
+		->where('created_at', '<', Carbon::now()->subHours(12)->toDateTimeString())
+		->orderBy('created_at','asc')
+		->take($limit)
+		->get();
+
+		$bar = $this->output->createProgressBar($gc->count());
+		$bar->start();
+		foreach($gc as $media) {
+			MediaStorageService::delete($media);
+			$media->forceDelete();
+			$bar->advance();
+		}
+		$bar->finish();
+	}
 }

app/Jobs/InboxPipeline/InboxValidator.php

@@ -223,6 +223,9 @@ class InboxValidator implements ShouldQueue
           'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
         ])->get($actor->remote_url);
         $res = json_decode($res->body(), true, 8);
+        if(!$res || empty($res) || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
+        	return;
+        }
         if($res['publicKey']['id'] !== $actor->key_id) {
             return;
         }

app/Jobs/InboxPipeline/InboxWorker.php

@@ -211,6 +211,9 @@ class InboxWorker implements ShouldQueue
           'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
         ])->get($actor->remote_url);
         $res = json_decode($res->body(), true, 8);
+        if(!$res || empty($res) || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
+        	return;
+        }
         if($res['publicKey']['id'] !== $actor->key_id) {
             return;
         }