mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update AvatarOptimize job

This commit is contained in:
Daniel Supernault 2019-04-06 16:20:00 -06:00
parent a896a6a956
commit 63f920a143
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/AvatarPipeline/AvatarOptimize.php
View File

@ -10,6 +10,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Str;
use Image as Intervention; use Image as Intervention;
class AvatarOptimize implements ShouldQueue class AvatarOptimize implements ShouldQueue
@ -67,7 +68,7 @@ class AvatarOptimize implements ShouldQueue
protected function deleteOldAvatar($new, $current) protected function deleteOldAvatar($new, $current)
{ {
if (storage_path('app/'.$new) == $current || $current == 'public/avatars/default.png') { if (storage_path('app/'.$new) == $current || Str::endsWith($current, 'avatars/default.png')) {
return; return;
} }
if (is_file($current)) { if (is_file($current)) {