MEP > merge develop into main (#355)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Endaman Stevy <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Stevy Endaman <[email protected]>

Author: 4 people

.github/workflows/dependabot-auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.2.0
+        uses: dependabot/fetch-metadata@v2.3.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Auto-merge Dependabot PRs for semver-minor updates

app/Actions/Article/CreateArticleAction.php

@@ -27,15 +27,35 @@ public function execute(ArticleData $articleData): Article
             );
         }
 
+        $user = Auth::user();
+
+        if ($user->isAdmin() || $user->isModerator()) {
+            $articleData->published_at = new Carbon(
+                time: today(),
+                timezone: config('app.timezone')
+            );
+
+            $articleData->submitted_at = new Carbon(
+                time: $articleData->submitted_at,
+                timezone: config('app.timezone')
+            );
+
+            $articleData->approved_at = new Carbon(
+                time: today(),
+                timezone: config('app.timezone')
+            );
+        }
+
         // @phpstan-ignore-next-line
         return Article::query()->create([
             'title' => $articleData->title,
             'slug' => $articleData->slug,
             'body' => $articleData->body,
             'published_at' => $articleData->published_at,
             'submitted_at' => $articleData->submitted_at,
+            'approved_at' => $articleData->approved_at,
             'canonical_url' => $articleData->canonical_url,
-            'user_id' => Auth::id(),
+            'user_id' => $user->id,
         ]);
     }
 }

app/Actions/Article/DeclineArticleAction.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Article;
+
+use App\Models\Article;
+use App\Notifications\ArticleDeclinedNotification;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+
+final class DeclineArticleAction
+{
+    public function execute(string $reason, Article $article): Article
+    {
+        return DB::transaction(function () use ($reason, $article) {
+
+            $article->update([
+                'declined_at' => Carbon::now(),
+                'reason' => $reason,
+                'submitted_at' => null,
+            ]);
+
+            $article->user->notify(new ArticleDeclinedNotification($article));
+
+            $article->refresh();
+
+            return $article;
+        });
+    }
+}

app/Actions/Article/UpdateArticleAction.php

@@ -31,6 +31,10 @@ public function execute(ArticleData $articleData, Article $article): Article
             );
         }
 
+        if ($articleData->declined_at) {
+            $articleData->declined_at = null;
+        }
+
         $article->update($articleData->toArray());
 
         $article->refresh();

app/Data/ArticleData.php

@@ -17,5 +17,7 @@ public function __construct(
         public ?string $canonical_url = null,
         public ?Carbon $published_at = null,
         public ?Carbon $submitted_at = null,
+        public ?Carbon $declined_at = null,
+        public ?Carbon $approved_at = null,
     ) {}
 }

app/Filament/Resources/ArticleResource.php

@@ -5,10 +5,13 @@
 namespace App\Filament\Resources;
 
 use App\Actions\Article\ApprovedArticleAction;
+use App\Actions\Article\DeclineArticleAction;
 use App\Filament\Resources\ArticleResource\Pages;
 use App\Models\Article;
 use Awcodes\FilamentBadgeableColumn\Components\Badge;
 use Awcodes\FilamentBadgeableColumn\Components\BadgeableColumn;
+use Filament\Forms\Components\Textarea;
+use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
@@ -99,7 +102,6 @@ public static function table(Table $table): Table
 
                         return '';
                     })
-                    ->searchable()
                     ->sortable(),
             ])
             ->actions([
@@ -123,15 +125,27 @@ public static function table(Table $table): Table
                         ->label('Décliner')
                         ->icon('heroicon-s-x-mark')
                         ->color('warning')
-                        ->modalHeading(__('Voulez vous décliner cet article'))
-                        ->successNotificationTitle(__('Opération effectuée avec succès'))
+                        ->form([
+                            Textarea::make('reason')
+                                ->label(__('Raison du refus'))
+                                ->maxLength(255)
+                                ->required(),
+                        ])
+                        ->modalHeading('Décliner l\'article')
+                        ->modalDescription('Veuillez fournir une raison détaillée pour le refus de cet article. L\'auteur recevra cette explication.')
+                        ->successNotificationTitle('Article décliné avec succès')
                         ->requiresConfirmation()
                         ->modalIcon('heroicon-s-x-mark')
-                        ->action(function ($record): void {
+                        ->action(function (array $data, Article $record): void {
                             Gate::authorize('decline', $record);
 
-                            $record->declined_at = now();
-                            $record->save();
+                            app(DeclineArticleAction::class)->execute($data['reason'], $record);
+
+                            Notification::make()
+                                ->title('Article décliné')
+                                ->body('L\'auteur a été notifié de la raison du refus.')
+                                ->success()
+                                ->send();
                         }),
                     Tables\Actions\Action::make('show')
                         ->icon('untitledui-eye')

app/Filament/Resources/ArticleResource/Pages/ListArticles.php

@@ -7,6 +7,7 @@
 use App\Filament\Resources\ArticleResource;
 use App\Models\Article;
 use Closure;
+use Filament\Resources\Components\Tab;
 use Filament\Resources\Pages\ListRecords;
 
 final class ListArticles extends ListRecords
@@ -17,4 +18,13 @@ public function isTableRecordSelectable(): Closure
     {
         return fn (Article $record): bool => $record->isNotPublished();
     }
+
+    public function getTabs(): array
+    {
+        return [
+            'En attente' => Tab::make()->query(fn ($query) => $query->awaitingApproval()),
+            'Apprové' => Tab::make()->query(fn ($query) => $query->published()),
+            'Décliné' => Tab::make()->query(fn ($query) => $query->declined()),
+        ];
+    }
 }

app/Models/Article.php

@@ -32,6 +32,7 @@
  * @property bool $is_pinned
  * @property int $is_sponsored
  * @property string | null $canonical_url
+ * @property string | null $reason
  * @property int | null $tweet_id
  * @property int $user_id
  * @property string | null $locale
@@ -63,6 +64,7 @@ final class Article extends Model implements HasMedia, ReactableInterface, Sitem
         'body',
         'slug',
         'canonical_url',
+        'reason',
         'show_toc',
         'is_pinned',
         'user_id',

app/Notifications/ArticleDeclinedNotification.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Notifications;
+
+use App\Models\Article;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+final class ArticleDeclinedNotification extends Notification
+{
+    use Queueable;
+
+    public function __construct(public Article $article) {}
+
+    public function via(mixed $notifiable): array
+    {
+        return ['mail', 'database'];
+    }
+
+    public function toMail(mixed $notifiable): MailMessage
+    {
+        return (new MailMessage)
+            ->subject(__('emails/article.article_declined.subject'))
+            ->markdown('emails.article_declined', ['article' => $this->article]);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(): array
+    {
+        return [
+            'article' => $this->article,
+            'owner' => $this->article->user->name,
+            'email' => $this->article->user->email,
+        ];
+    }
+}

app/Providers/EventServiceProvider.php

@@ -9,18 +9,15 @@
 use App\Events\CommentWasAdded;
 use App\Events\ReplyWasCreated;
 use App\Events\SponsoringPaymentInitialize;
-use App\Events\ThreadWasCreated;
 use App\Events\UserBannedEvent;
 use App\Events\UserUnbannedEvent;
 // use App\Listeners\SendCompanyEmailVerificationNotification;
 use App\Listeners\NotifyMentionedUsers;
-use App\Listeners\PostNewThreadNotification;
 use App\Listeners\SendBanNotificationListener;
 use App\Listeners\SendNewArticleNotification;
 use App\Listeners\SendNewCommentNotification;
 // use App\Listeners\SendWelcomeCompanyNotification;
 use App\Listeners\SendNewReplyNotification;
-use App\Listeners\SendNewThreadNotification;
 use App\Listeners\SendPaymentNotification;
 use App\Listeners\SendUnbanNotificationListener;
 use App\Listeners\SendWelcomeMailNotification;
@@ -42,10 +39,6 @@ final class EventServiceProvider extends ServiceProvider
             SendNewReplyNotification::class,
             NotifyMentionedUsers::class,
         ],
-        ThreadWasCreated::class => [
-            SendNewThreadNotification::class,
-            PostNewThreadNotification::class,
-        ],
         ArticleWasSubmittedForApproval::class => [
             SendNewArticleNotification::class,
         ],

composer.json

@@ -23,6 +23,7 @@
     "gehrisandro/tailwind-merge-laravel": "^1.2",
     "graham-campbell/markdown": "^15.2",
     "guzzlehttp/guzzle": "^7.7.0",
+    "internachi/modular": "^2.3",
     "jenssegers/agent": "^2.6.4",
     "laravel-notification-channels/telegram": "^5.0",
     "laravel-notification-channels/twitter": "^8.1",