chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update TransformImports command, improve handling of imported posts that already exist or are from deleted accounts

This commit is contained in:
Daniel Supernault 2023-06-26 04:16:49 -06:00
parent b18f3fba8b
commit 892907d5d1
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/ImportUploadGarbageCollection.php
View File

@ -32,7 +32,7 @@ class ImportUploadGarbageCollection extends Command
return;
}
$ips = ImportPost::whereNull('status_id')->whereSkipMissingMedia(true)->take(100)->get();
$ips = ImportPost::whereNull('status_id')->where('skip_missing_media', true)->take(100)->get();
if(!$ips->count()) {
return;

28
app/Console/Commands/TransformImports.php
View File

@ -54,22 +54,22 @@ class TransformImports extends Command
continue;
}
$idk = ImportService::getId($ip->user_id, $ip->creation_year, $ip->creation_month, $ip->creation_day);
$exists = ImportPost::whereUserId($id)->where('filename', $ip->filename)->first();
if($exists) {
$cYear = str_pad($exists->creation_year, 2, 0, STR_PAD_LEFT);
$cMonth = str_pad($exists->creation_month, 2, 0, STR_PAD_LEFT);
$cDay = str_pad($exists->creation_day, 2, 0, STR_PAD_LEFT);
if( $cYear == $idk['year'] &&
$cMonth == $idk['month'] &&
$cDay == $idk['day']
) {
$ip->skip_missing_media = true;
$ip->save();
continue;
}
$exists = ImportPost::whereUserId($id)
->whereNotNull('status_id')
->where('filename', $ip->filename)
->where('creation_year', $ip->creation_year)
->where('creation_month', $ip->creation_month)
->where('creation_day', $ip->creation_day)
->exists();
if($exists == true) {
$ip->skip_missing_media = true;
$ip->save();
continue;
}
$idk = ImportService::getId($ip->user_id, $ip->creation_year, $ip->creation_month, $ip->creation_day);
if(Storage::exists('imports/' . $id . '/' . $ip->filename) === false) {
ImportService::clearAttempts($profile->id);
ImportService::getPostCount($profile->id, true);

5
app/Observers/StatusObserver.php
View File

@ -5,6 +5,7 @@ namespace App\Observers;
use App\Status;
use App\Services\ProfileStatusService;
use Cache;
use App\Services\ImportService;
class StatusObserver
{
@ -56,6 +57,10 @@ class StatusObserver
}
ProfileStatusService::delete($status->profile_id, $status->id);
if($status->uri == null) {
ImportService::clearImportedFiles($status->profile_id);
}
}
/**

6
app/Services/ImportService.php
View File

@ -102,4 +102,10 @@ class ImportService
})->flatten();
});
}
public static function clearImportedFiles($profileId)
{
$key = self::CACHE_KEY . 'importedPostsByProfileId:' . $profileId;
return Cache::forget($key);
}
}