From 284a694030546252ffa8dc08c710d4153b3ef8fa Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 17 Jan 2020 21:23:11 -0700
Subject: [PATCH 1/3] Update admin partials

---
 .../views/admin/partial/template-full.blade.php    | 14 +-------------
 resources/views/admin/partial/template.blade.php   | 12 +-----------
 resources/views/admin/partial/topnav.blade.php     |  6 +++---
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/resources/views/admin/partial/template-full.blade.php b/resources/views/admin/partial/template-full.blade.php
index a018f8458..954dac3f9 100644
--- a/resources/views/admin/partial/template-full.blade.php
+++ b/resources/views/admin/partial/template-full.blade.php
@@ -23,16 +23,4 @@
   </div>
 </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
\ No newline at end of file
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/partial/template.blade.php b/resources/views/admin/partial/template.blade.php
index ab2368b6f..4ec312366 100644
--- a/resources/views/admin/partial/template.blade.php
+++ b/resources/views/admin/partial/template.blade.php
@@ -24,14 +24,4 @@
   </div>
 </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
\ No newline at end of file
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/partial/topnav.blade.php b/resources/views/admin/partial/topnav.blade.php
index c0ca084d6..bbc92ff10 100644
--- a/resources/views/admin/partial/topnav.blade.php
+++ b/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':''}}">
-          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <li class="nav-item dropdown mx-3 {{request()->is(['*settings*','*discover*', '*site-news*'])?'active':''}}">
+          <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">

From 578d2f353dd16efdcae1c79fc082c714e0f28279 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 19 Jan 2020 21:51:21 -0700
Subject: [PATCH 2/3] Update DeleteAccountPipeline

---
 .../DeletePipeline/DeleteAccountPipeline.php  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php b/app/Jobs/DeletePipeline/DeleteAccountPipeline.php
index 06e8191a6..735586576 100644
--- a/app/Jobs/DeletePipeline/DeleteAccountPipeline.php
+++ b/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;
-                $thumb = $media->thumbnail_path;
+                $path = storage_path('app/'.$media->media_path);
+                $thumb = storage_path('app/'.$media->thumbnail_path);
                 if(is_file($path)) {
                     unlink($path);
                 }

From 238e0cc057441a15c0a5a26219b459e7f57a11cf Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 19 Jan 2020 21:52:18 -0700
Subject: [PATCH 3/3] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 473605f11..6e81f76d3 100644
--- a/CHANGELOG.md
+++ b/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