Merge pull request #4284 from pixelfed/staging

Staging

app/Console/Commands/MediaS3GarbageCollector.php

@@ -66,7 +66,13 @@ class MediaS3GarbageCollector extends Command
             return;
         }
 
-        $minId = Media::orderByDesc('id')->where('created_at', '<', now()->subHours(12))->first()->id;
+        $minId = Media::orderByDesc('id')->where('created_at', '<', now()->subHours(12))->first();
+
+        if(!$minId) {
+        	return;
+        } else {
+        	$minId = $minId->id;
+        }
 
         return $hugeMode ?
             $this->hugeMode($minId, $limit, $log) :

app/Http/Controllers/StatusController.php

@@ -219,11 +219,11 @@ class StatusController extends Controller
 			$u->save();
 		}
 
-		Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
-		Cache::forget('profile:status_count:' . $status->profile_id);
-		Cache::forget('profile:embed:' . $status->profile_id);
-		StatusService::del($status->id, true);
 		if ($status->profile_id == $user->profile->id || $user->is_admin == true) {
+			Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
+			Cache::forget('profile:status_count:' . $status->profile_id);
+			Cache::forget('profile:embed:' . $status->profile_id);
+			StatusService::del($status->id, true);
 			Cache::forget('profile:status_count:'.$status->profile_id);
 			StatusDelete::dispatch($status);
 		}