Update avatar deletion

6 years ago · a641db0764
parent 14fa51fa30
commit a641db0764
2 changed files with 7 additions and 12 deletions
--- a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php
+++ b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php
@ -74,17 +74,6 @@ class DeleteAccountPipeline implements ShouldQueue
            if($user->profile) {
                $avatar = $user->profile->avatar;

-                if(is_file($avatar->media_path)) {
-                    if($avatar->media_path != 'public/avatars/default.png') {
-                        unlink($avatar->media_path);
-                    }
-                }
-
-                if(is_file($avatar->thumb_path)) {
-                    if($avatar->thumb_path != 'public/avatars/default.png') {
-                        unlink($avatar->thumb_path);
-                    }
-                }
                $avatar->forceDelete();
            }

--- a/app/Observers/AvatarObserver.php
+++ b/app/Observers/AvatarObserver.php
@ -48,7 +48,13 @@ class AvatarObserver
    public function deleting(Avatar $avatar)
    {
        $path = storage_path('app/'.$avatar->media_path);
-        @unlink($path);
+        if(is_file($path) && $avatar->media_path != 'public/avatars/default.png') {
+            @unlink($path);
+        }
+        $path = storage_path('app/'.$avatar->thumb_path);
+        if(is_file($path) && $avatar->thumb_path != 'public/avatars/default.png') {
+            @unlink($path);
+        }
    }

    /**