MEP > merge develop into main (#355)

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

Author: 4 people

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

@@ -13,7 +13,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.4.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

@@ -13,20 +13,40 @@ final class CreateArticleAction
 {
     public function execute(ArticleData $articleData): Article
     {
-        if ($articleData->published_at instanceof Carbon) {
+        if ($articleData->published_at) {
             $articleData->published_at = new Carbon(
                 time: $articleData->published_at,
                 timezone: config('app.timezone')
             );
         }
 
-        if ($articleData->submitted_at instanceof Carbon) {
+        if ($articleData->submitted_at) {
             $articleData->submitted_at = new Carbon(
                 time: $articleData->submitted_at,
                 timezone: config('app.timezone')
             );
         }
 
+        $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,
@@ -35,7 +55,7 @@ public function execute(ArticleData $articleData): Article
             '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

@@ -14,7 +14,6 @@ final class DeclineArticleAction
     public function execute(string $reason, Article $article): Article
     {
         return DB::transaction(function () use ($reason, $article): Article {
-
             $article->update([
                 'declined_at' => Carbon::now(),
                 'reason' => $reason,

app/Actions/Article/UpdateArticleAction.php

@@ -17,21 +17,21 @@ public function execute(ArticleData $articleData, Article $article): Article
             throw new CannotUpdateApprovedArticle(__('notifications.exceptions.approved_article'));
         }
 
-        if ($articleData->published_at instanceof Carbon) {
+        if ($articleData->published_at) {
             $articleData->published_at = new Carbon(
                 time: $articleData->published_at,
                 timezone: config('app.timezone')
             );
         }
 
-        if ($articleData->submitted_at instanceof Carbon) {
+        if ($articleData->submitted_at) {
             $articleData->submitted_at = new Carbon(
                 time: $articleData->submitted_at,
                 timezone: config('app.timezone')
             );
         }
 
-        if ($articleData->declined_at instanceof Carbon) {
+        if ($articleData->declined_at) {
             $articleData->declined_at = null;
         }