UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Status model, improve thumb logic

Browse source
This commit is contained in:
Daniel Supernault 2023-09-25 01:57:43 -06:00
parent 439638f7d7
commit d969a97360
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Services/StatusService.php
View file

@ -161,8 +161,6 @@ class StatusService
} }
Cache::forget('status:transformer:media:attachments:' . $id); Cache::forget('status:transformer:media:attachments:' . $id);
MediaService::del($id); MediaService::del($id);
Cache::forget('status:thumb:nsfw0' . $id);
Cache::forget('status:thumb:nsfw1' . $id);
Cache::forget('pf:services:sh:id:' . $id); Cache::forget('pf:services:sh:id:' . $id);
PublicTimelineService::rem($id); PublicTimelineService::rem($id);
NetworkTimelineService::rem($id); NetworkTimelineService::rem($id);

30
app/Status.php
View file

@ -9,7 +9,9 @@ use App\Http\Controllers\StatusController;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use App\Models\Poll; use App\Models\Poll;
use App\Services\AccountService; use App\Services\AccountService;
use App\Services\StatusService;
use App\Models\StatusEdit; use App\Models\StatusEdit;
use Illuminate\Support\Str;
class Status extends Model class Status extends Model
{ {
@ -95,16 +97,26 @@ class Status extends Model
public function thumb($showNsfw = false) public function thumb($showNsfw = false)
{ {
$key = $showNsfw ? 'status:thumb:nsfw1'.$this->id : 'status:thumb:nsfw0'.$this->id; $entity = StatusService::get($this->id);
return Cache::remember($key, now()->addMinutes(15), function() use ($showNsfw) {
$type = $this->type ?? $this->setType();
$is_nsfw = !$showNsfw ? $this->is_nsfw : false;
if ($this->media->count() == 0 || $is_nsfw || !in_array($type,['photo', 'photo:album', 'video'])) {
return url(Storage::url('public/no-preview.png'));
}
return url(Storage::url($this->firstMedia()->thumbnail_path)); if(!$entity || !isset($entity['media_attachments']) || empty($entity['media_attachments'])) {
}); return url(Storage::url('public/no-preview.png'));
}
if((!isset($entity['sensitive']) || $entity['sensitive']) && !$showNsfw) {
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) {
if(!Str::endsWith($media['preview_url'], ['no-preview.png', 'no-preview.jpg'])) {
return $media['preview_url'];
}
return $media['url'];
})
->first() ?? url(Storage::url('public/no-preview.png'));
} }
public function url($forceLocal = false) public function url($forceLocal = false)