Merge pull request #1946 from pixelfed/staging

Fix account deletion bug

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Fixed header background bug on MomentUI profiles ([#1933](https://github.com/pixelfed/pixelfed/pull/1933))
 - Fixed TRUST_PROXIES configuration ([#1941](https://github.com/pixelfed/pixelfed/pull/1941))
 - Fixed settings page default language ([4223a11e](https://github.com/pixelfed/pixelfed/commit/4223a11e))
+- Fixed DeleteAccountPipeline bug that did not use proper media paths ([578d2f35](https://github.com/pixelfed/pixelfed/commit/578d2f35))
 
 
 ### Changed

app/Jobs/DeletePipeline/DeleteAccountPipeline.php

@@ -30,6 +30,8 @@ use App\{
     ReportLog,
     StatusHashtag,
     Status,
+    Story,
+    StoryView,
     User,
     UserDevice,
     UserFilter,
@@ -91,11 +93,25 @@ class DeleteAccountPipeline implements ShouldQueue
             Like::whereProfileId($id)->forceDelete();
         });
 
+        DB::transaction(function() use ($user) {
+            $pid = $this->user->profile_id;
+
+            StoryView::whereProfileId($pid)->delete();
+            $stories = Story::whereProfileId($pid)->get();
+            foreach($stories as $story) {
+                $path = storage_path('app/'.$story->path);
+                if(is_file($path)) {
+                    unlink($path);
+                }
+                $story->forceDelete();
+            }
+        });
+
         DB::transaction(function() use ($user) {
             $medias = Media::whereUserId($user->id)->get();
             foreach($medias as $media) {
-                $path = $media->media_path;
+                $path = storage_path('app/'.$media->media_path);
-                $thumb = $media->thumbnail_path;
+                $thumb = storage_path('app/'.$media->thumbnail_path);
                 if(is_file($path)) {
                     unlink($path);
                 }

resources/views/admin/partial/template-full.blade.php

@@ -24,15 +24,3 @@
 </div>
 
 @endsection
-
-@push('scripts')
-<script type="text/javascript">
-$(document).ready(function() {
-  $('a[data-target="#composeModal"]').on('click', function() {
-    $('#composeModal').modal('hide');
-    swal('Not Supported', 'You cannot compose a post from the admin dashboard.', 'error');
-    return;
-  });
-});
-</script>
-@endpush

resources/views/admin/partial/template.blade.php

@@ -25,13 +25,3 @@
 </div>
 
 @endsection
-
-@push('scripts')
-<script type="text/javascript">
-$(document).ready(function() {
-  $('a#composeModal').on('click', function() {
-    swal('Not Supported', 'You cannot compose a post from the admin dashboard.', 'error');
-  });
-});
-</script>
-@endpush

resources/views/admin/partial/topnav.blade.php

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
+<nav class="navbar navbar-expand-lg navbar-light">
   <div class="container">
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topbarNav" aria-controls="topbarNav" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
@@ -29,8 +29,8 @@
         <li class="nav-item mx-2 {{request()->is('*users*')?'active':''}}">
           <a class="nav-link font-weight-lighter text-muted" href="{{route('admin.users')}}">Users</a>
         </li>
-        <li class="nav-item dropdown mx-2 {{request()->is(['*settings*','*discover*', '*site-news*'])?'active':''}}">
+        <li class="nav-item dropdown mx-3 {{request()->is(['*settings*','*discover*', '*site-news*'])?'active':''}}">
-          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <a class="nav-link dropdown-toggle px-4" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             More
           </a>
           <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">