diff --git a/app/Jobs/UpdateVkPostJob.php b/app/Jobs/UpdateVkPostJob.php index 16463fb..af2f9b9 100644 --- a/app/Jobs/UpdateVkPostJob.php +++ b/app/Jobs/UpdateVkPostJob.php @@ -55,14 +55,12 @@ class UpdateVkPostJob implements ShouldQueue $vk_post = $wallService->getPostById($this->post_id); - // доделать - if ($vk_post['attachments']) { - Log::info($vk_post); - if ($this->getAlbumAttachment($vk_post['attachments'])) { - Log::info('вход в аттачментс вк'); - $album = $this->getAlbumAttachment($vk_post['attachments']); - Log::info($album); - $albumService->deleteAlbum($album['album']['id'], $this->public_id); + if ($vk_post['attachments']) { + $pattern = '/\[https:\/\/vk.com\/album-?[0-9]+_([0-9]+)\|.*\]/'; + preg_match($pattern, $vk_post['text'], $matches); + if (isset($matches[1])) { + $album_id = $matches[1]; + $albumService->deleteAlbum($album_id, $this->public_id); } } diff --git a/app/Services/VK/VkService.php b/app/Services/VK/VkService.php index 9baf425..f6fd0b6 100644 --- a/app/Services/VK/VkService.php +++ b/app/Services/VK/VkService.php @@ -102,7 +102,16 @@ class VkService $postRelation = DB::table('posts_vk_posts')->select()->where('post_id', $post_id)->first(); $post_id = $postRelation->vk_post_id; $vk_post = $this->getPostById($post_id); - $this->wallService->deletePost($vk_post['id']); + + $pattern = '/\[https:\/\/vk.com\/album-?[0-9]+_([0-9]+)\|.*\]/'; + preg_match($pattern, $vk_post['text'], $matches); + if (isset($matches[1])) { + $album_id = $matches[1]; + $this->albumService->deleteAlbum($album_id, $this->public_id); + $this->wallService->deletePost($vk_post['id']); + } else { + $this->wallService->deletePost($vk_post['id']); + } } public function createAlbum(string $title, $images)