diff --git a/app/Data/Casts/ChangelogCast.php b/app/Data/Casts/ChangelogCast.php index 7a489a9..7d468e4 100644 --- a/app/Data/Casts/ChangelogCast.php +++ b/app/Data/Casts/ChangelogCast.php @@ -22,11 +22,11 @@ class ChangelogCast implements Cast 'allow_unsafe_links' => false, ]; - protected array $tagsFrom = ['h2', '
  • ']; + protected array $tagsFrom = ['h2', '
  • ', '
  • ']; - protected array $tagsTo = ['b', '- ']; + protected array $tagsTo = ['b', '- ', '']; - protected string $allowedTags = '

  • '; + protected array $allowedTags = ['h2', 'li', 'i']; public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): string { diff --git a/app/Jobs/Telegram/ReleaseJob.php b/app/Jobs/Telegram/ReleaseJob.php index aab8234..b4d5f6d 100644 --- a/app/Jobs/Telegram/ReleaseJob.php +++ b/app/Jobs/Telegram/ReleaseJob.php @@ -4,7 +4,6 @@ namespace App\Jobs\Telegram; -use App\Data\ReleaseData; use App\Jobs\Job; use DefStudio\Telegraph\Models\TelegraphChat; use Throwable; @@ -15,7 +14,11 @@ class ReleaseJob extends Job public function __construct( public int $chatId, - public ReleaseData $data + public string $organization, + public string $repository, + public string $version, + public string $changelog, + public string $url ) {} public function handle(): void @@ -38,7 +41,13 @@ protected function send(): void protected function message(): string { - return view('message', ['release' => $this->data])->toHtml(); + return view('message', [ + 'organization' => $this->organization, + 'repository' => $this->repository, + 'version' => $this->version, + 'changelog' => $this->changelog, + 'url' => $this->url, + ])->toHtml(); } protected function resetErrors(): void diff --git a/app/Services/Telegram.php b/app/Services/Telegram.php index cda38ab..39f3323 100644 --- a/app/Services/Telegram.php +++ b/app/Services/Telegram.php @@ -14,7 +14,14 @@ class Telegram public function publish(ReleaseData $data): void { $this->chats()->each( - fn (TelegraphChat $chat) => ReleaseJob::dispatch($chat->id, $data) + fn (TelegraphChat $chat) => ReleaseJob::dispatch( + $chat->id, + $data->organization, + $data->repository, + $data->version, + $data->changelog, + $data->url + ) ); } diff --git a/resources/views/message.blade.php b/resources/views/message.blade.php index afa030e..3ac07f4 100644 --- a/resources/views/message.blade.php +++ b/resources/views/message.blade.php @@ -1,5 +1,5 @@ -{{ $release->organization }} {{ $release->repository }} {{ $release->version }} released +{{ $organization }} {{ $repository }} {{ $version }} released -{!! $release->changelog !!} +{!! $changelog !!} -{{ $release->url }} +{{ $url }}