Merge pull request #3955 from pixelfed/staging

Update MediaS3GarbageCollector
This commit is contained in:
daniel 2022-12-17 22:27:15 -07:00 committed by GitHub
commit 823ecf7159
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,6 +7,8 @@ use App\Media;
use App\Status; use App\Status;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use App\Services\MediaService;
use App\Services\StatusService;
class MediaS3GarbageCollector extends Command class MediaS3GarbageCollector extends Command
{ {
@ -94,6 +96,8 @@ class MediaS3GarbageCollector extends Command
$media->version = 4; $media->version = 4;
$media->save(); $media->save();
$totalSize = $totalSize + $media->size; $totalSize = $totalSize + $media->size;
MediaService::del($media->status_id);
StatusService::del($media->status_id, false);
} else { } else {
$media->version = 4; $media->version = 4;
$media->save(); $media->save();
@ -133,6 +137,8 @@ class MediaS3GarbageCollector extends Command
$localDisk->delete($media->media_path); $localDisk->delete($media->media_path);
$media->version = 4; $media->version = 4;
$media->save(); $media->save();
MediaService::del($media->status_id);
StatusService::del($media->status_id, false);
} else { } else {
$media->version = 4; $media->version = 4;
$media->save(); $media->save();