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

Update ComposeController, use MediaStorageService for media deletes

Browse source
This commit is contained in:
Daniel Supernault 2021-02-05 21:04:34 -07:00
parent 37dbb3de29
commit ab5469ff70
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/ComposeController.php
View file

@ -38,6 +38,7 @@ use App\Jobs\VideoPipeline\{
use App\Services\NotificationService; use App\Services\NotificationService;
use App\Services\MediaPathService; use App\Services\MediaPathService;
use App\Services\MediaBlocklistService; use App\Services\MediaBlocklistService;
use App\Services\MediaStorageService;
use App\Services\MediaTagService; use App\Services\MediaTagService;
use App\Services\ServiceService; use App\Services\ServiceService;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -193,8 +194,7 @@ class ComposeController extends Controller
->whereUserId(Auth::id()) ->whereUserId(Auth::id())
->findOrFail($request->input('id')); ->findOrFail($request->input('id'));
Storage::delete($media->media_path); MediaStorageService::delete($media, true);
Storage::delete($media->thumbnail_path);
$media->forceDelete(); $media->forceDelete();
@ -388,6 +388,7 @@ class ComposeController extends Controller
} }
$status->caption = strip_tags($request->caption); $status->caption = strip_tags($request->caption);
$status->rendered = Autolink::create()->autolink($status->caption);
$status->scope = 'draft'; $status->scope = 'draft';
$status->profile_id = $profile->id; $status->profile_id = $profile->id;
$status->save(); $status->save();