From 10dd348c28faab466b2c2cf14b05287a4c9f052c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 26 Jun 2023 04:46:57 -0600 Subject: [PATCH] Update ImportService, filter deleted posts from getImportedPosts endpoint --- app/Observers/StatusObserver.php | 1 + app/Services/ImportService.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Observers/StatusObserver.php b/app/Observers/StatusObserver.php index 99d6a89ff..6cee10a97 100644 --- a/app/Observers/StatusObserver.php +++ b/app/Observers/StatusObserver.php @@ -59,6 +59,7 @@ class StatusObserver ProfileStatusService::delete($status->profile_id, $status->id); if($status->uri == null) { + ImportPost::whereProfileId($status->profile_id)->whereStatusId($status->id)->delete(); ImportService::clearImportedFiles($status->profile_id); } } diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 8ca12b445..aac3fde4a 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -97,9 +97,12 @@ class ImportService return Cache::remember($key, 21600, function() use($profileId) { return ImportPost::whereProfileId($profileId) ->get() + ->filter(function($ip) { + return StatusService::get($ip->status_id); + }) ->map(function($ip) { return collect($ip->media)->map(function($m) { return $m['uri']; }); - })->flatten(); + })->values()->flatten(); }); }