Skip to content

Commit b8a99a7

Browse files
committed
fix(LAR-66): Laravel notification pending articles
1 parent aca5e45 commit b8a99a7

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ composer.phar
1515

1616
# Laravel Exclude
1717
#
18+
.phpunit.cache
1819
.phpunit.result.cache
1920
/public/build
2021
/public/**/filament

app/Console/Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected function schedule(Schedule $schedule): void
2323
$schedule->command('lcm:post-article-to-telegram')->everyFourHours();
2424
$schedule->command('lcm:send-unverified-mails')->weeklyOn(1, '8:00');
2525
$schedule->command('sitemap:generate')->daily();
26-
$schedule->command('lcm:notify-pending-articles')->days(2);
26+
$schedule->command('lcm:notify-pending-articles')->cron('8 0 */2 * *');
2727
}
2828
}
2929

app/Listeners/SendNewArticleNotification.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010

1111
final readonly class SendNewArticleNotification
1212
{
13-
public function __construct(private AnonymousNotifiable $notifiable)
14-
{
15-
}
13+
public function __construct(private AnonymousNotifiable $notifiable) {}
1614

1715
public function handle(ArticleWasSubmittedForApproval $event): void
1816
{

app/Notifications/ArticleSubmitted.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ final class ArticleSubmitted extends Notification implements ShouldQueue
1515
{
1616
use Queueable;
1717

18-
public function __construct(private readonly Article $article)
19-
{
20-
}
18+
public function __construct(private readonly Article $article) {}
2119

2220
public function via(mixed $notifiable): array
2321
{

app/Notifications/PendingArticlesNotification.php

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@
55
namespace App\Notifications;
66

77
use Illuminate\Bus\Queueable;
8-
use Illuminate\Notifications\Notification;
98
use Illuminate\Database\Eloquent\Collection;
9+
use Illuminate\Notifications\Notification;
1010
use NotificationChannels\Telegram\TelegramChannel;
1111
use NotificationChannels\Telegram\TelegramMessage;
1212

1313
final class PendingArticlesNotification extends Notification
1414
{
1515
use Queueable;
1616

17-
public function __construct(public Collection $pendingArticles)
18-
{
19-
}
17+
public function __construct(public Collection $pendingArticles) {}
2018

2119
public function via(mixed $notifiable): array
2220
{
@@ -28,24 +26,28 @@ public function toTelegram(): TelegramMessage
2826
$message = $this->content();
2927

3028
return TelegramMessage::create()
31-
->to(config('services.telegram-bot-api.channel'))->content($message);
29+
->to(config('services.telegram-bot-api.channel'))
30+
->content($message);
3231
}
3332

3433
private function content(): string
3534
{
36-
$message = __("Articles soumis en attente d'approbation:\n\n");
35+
$heading = "*Articles soumis en attente d'approbation!*";
36+
$messages = "{$heading}\n\n";
37+
3738
foreach ($this->pendingArticles as $article) {
38-
$message .= __(
39+
$messages .= __(
3940
"[@:username](:profile_url) a soumit l'article [:title](:url) le: :date\n\n",
4041
[
4142
'username' => $article->user?->username,
4243
'profile_url' => route('profile', $article->user?->username),
4344
'title' => $article->title,
4445
'url' => route('articles.show', $article->slug),
45-
'date' => $article->submitted_at->translatedFormat('d M Y')
46+
'date' => $article->submitted_at->translatedFormat('d M Y'),
4647
]
4748
);
4849
}
49-
return $message;
50+
51+
return $messages;
5052
}
5153
}

0 commit comments

Comments
 (0)