diff --git a/app/Console/Commands/Internal/TransformImports.php b/app/Console/Commands/Internal/TransformImports.php index 8fc2e92fe..da3491959 100644 --- a/app/Console/Commands/Internal/TransformImports.php +++ b/app/Console/Commands/Internal/TransformImports.php @@ -125,7 +125,7 @@ class TransformImports extends Command continue; } - $caption = $ip->caption ?? ''; + $caption = strip_tags($ip->caption ?? ''); $mediaRecords = []; foreach ($ip->media as $ipm) { @@ -192,9 +192,11 @@ class TransformImports extends Command $ip->status_id = $status->id; $ip->creation_id = $uniqueIdData['incr']; - if ($uniqueIdData['year'] !== $ip->creation_year || + if ( + $uniqueIdData['year'] !== $ip->creation_year || $uniqueIdData['month'] !== $ip->creation_month || - $uniqueIdData['day'] !== $ip->creation_day) { + $uniqueIdData['day'] !== $ip->creation_day + ) { $ip->creation_year = $uniqueIdData['year']; $ip->creation_month = $uniqueIdData['month']; @@ -212,7 +214,6 @@ class TransformImports extends Command AccountService::del($profile->id); ImportService::clearAttempts($profile->id); ImportService::getPostCount($profile->id, true); - } catch (QueryException $e) { $this->error("Database error for ImportPost ID {$ip->id}: ".$e->getMessage()); $ip->skip_missing_media = true; diff --git a/app/Http/Controllers/ImportPostController.php b/app/Http/Controllers/ImportPostController.php index 1b0670980..d00d6913f 100644 --- a/app/Http/Controllers/ImportPostController.php +++ b/app/Http/Controllers/ImportPostController.php @@ -149,9 +149,9 @@ class ImportPostController extends Controller ]; })->toArray(); - $ip->caption = $c->count() > 1 ? + $ip->caption = strip_tags($c->count() > 1 ? $this->formatHashtags($file['title'] ?? '') : - $this->formatHashtags($ip->media[0]['title'] ?? ''); + $this->formatHashtags($ip->media[0]['title'] ?? '')); $originalFilename = last(explode('/', $ip->media[0]['uri'] ?? '')); $ip->filename = $this->sanitizeFilename($originalFilename); @@ -164,8 +164,7 @@ class ImportPostController extends Controller })->toArray(); $creationTimestamp = $c->count() > 1 ? - ($file['creation_timestamp'] ?? null) : - ($media[0]['creation_timestamp'] ?? null); + ($file['creation_timestamp'] ?? null) : ($media[0]['creation_timestamp'] ?? null); if ($creationTimestamp) { $ip->creation_date = now()->parse($creationTimestamp);