fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3319 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-03-16 20:23:49 -06:00 committed by GitHub
parent c7468f6a38 b464021058
commit 19192a2e3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
app/Console/Commands/MediaGarbageCollector.php
View file

@ -5,62 +5,56 @@ namespace App\Console\Commands;
use Illuminate\Console\Command;
use App\{Media, Status};
use Carbon\Carbon;
use App\Services\MediaStorageService;
class MediaGarbageCollector extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'media:gc';
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'media:gc';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Delete media uploads not attached to any active statuses';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Delete media uploads not attached to any active statuses';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
$limit = 20000;
$gc = Media::doesntHave('status')
->where('created_at', '<', Carbon::now()->subHours(1)->toDateTimeString())
->orderBy('created_at','asc')
->take($limit)
->get();
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
$limit = 20000;
$bar = $this->output->createProgressBar($gc->count());
$bar->start();
foreach($gc as $media) {
$path = storage_path("app/$media->media_path");
$thumb = storage_path("app/$media->thumbnail_path");
if(is_file($path)) {
unlink($path);
}
if(is_file($thumb)) {
unlink($thumb);
}
$media->forceDelete();
$bar->advance();
}
$bar->finish();
}
$gc = Media::whereNull('status_id')
->where('created_at', '<', Carbon::now()->subHours(12)->toDateTimeString())
->orderBy('created_at','asc')
->take($limit)
->get();
$bar = $this->output->createProgressBar($gc->count());
$bar->start();
foreach($gc as $media) {
MediaStorageService::delete($media);
$media->forceDelete();
$bar->advance();
}
$bar->finish();
}
}

3
app/Jobs/InboxPipeline/InboxValidator.php
View file

@ -223,6 +223,9 @@ class InboxValidator implements ShouldQueue
'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
])->get($actor->remote_url);
$res = json_decode($res->body(), true, 8);
if(!$res || empty($res) || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
return;
}
if($res['publicKey']['id'] !== $actor->key_id) {
return;
}

3
app/Jobs/InboxPipeline/InboxWorker.php
View file

@ -211,6 +211,9 @@ class InboxWorker implements ShouldQueue
'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
])->get($actor->remote_url);
$res = json_decode($res->body(), true, 8);
if(!$res || empty($res) || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
return;
}
if($res['publicKey']['id'] !== $actor->key_id) {
return;
}

2
public/js/profile-xl3w8bxy.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -26,7 +26,7 @@
"/js/home-xl3w8bxy.js": "/js/home-xl3w8bxy.js?id=9c4aed07051c46529a7d4140f795a851",
"/js/compose-xl3w8bxy.js": "/js/compose-xl3w8bxy.js?id=84580c040776bef4fb2d7d2a43a10022",
"/js/post-xl3w8bxy.js": "/js/post-xl3w8bxy.js?id=1147b754b401e714584b7c6ba19e3df1",
"/js/profile-xl3w8bxy.js": "/js/profile-xl3w8bxy.js?id=93a3dcdb3f18fce6e5b3d63fbc5e02a0",
"/js/profile-xl3w8bxy.js": "/js/profile-xl3w8bxy.js?id=21b72c974f40d02ead61a218de615bc4",
"/js/dmym-xl3w8bxy.js": "/js/dmym-xl3w8bxy.js?id=3d67875d8ccbdd6afc910c43cced8e37",
"/js/dmyh-xl3w8bxy.js": "/js/dmyh-xl3w8bxy.js?id=649b6c4e1639411791b71ae267f2c42b",
"/js/daci-xl3w8bxy.js": "/js/daci-xl3w8bxy.js?id=a1b350e3cb5a542684b891322bd69116",