Explorar o código

Merge pull request #4667 from pixelfed/staging

Update Status model, allow unlisted thumbnails
daniel hai 1 ano
pai
achega
b2195ca837
Modificáronse 1 ficheiros con 5 adicións e 1 borrados
  1. 5 1
      app/Status.php

+ 5 - 1
app/Status.php

@@ -97,7 +97,7 @@ class Status extends Model
 
 	public function thumb($showNsfw = false)
 	{
-		$entity = StatusService::get($this->id);
+		$entity = StatusService::get($this->id, false);
 
 		if(!$entity || !isset($entity['media_attachments']) || empty($entity['media_attachments'])) {
 			return url(Storage::url('public/no-preview.png'));
@@ -107,6 +107,10 @@ class Status extends Model
 			return url(Storage::url('public/no-preview.png'));
 		}
 
+        if(!isset($entity['visibility']) || !in_array($entity['visibility'], ['public', 'unlisted'])) {
+            return url(Storage::url('public/no-preview.png'));
+        }
+
 		return collect($entity['media_attachments'])
             ->filter(fn($media) => $media['type'] == 'image' && in_array($media['mime'], ['image/jpeg', 'image/png']))
             ->map(function($media) {