Fix articles code

Author: driesvints

app/Http/Controllers/Articles/ArticlesController.php

@@ -45,30 +45,27 @@ public function index(Request $request)
             ->latest('approved_at')
             ->{$filter}();
 
-        $tags = Tag::whereHas('articles', function ($query) {
-            $query->published();
-        })->orderBy('name')->get();
+        $tags = Tag::whereHas('articles', fn ($query) => $query->published())
+            ->orderBy('name')
+            ->get();
 
         if ($activeTag = Tag::where('slug', $request->tag)->first()) {
             $articles->forTag($activeTag->slug());
         }
 
-        $moderators = Cache::remember('moderators', now()->addMinutes(30), function () {
-            return User::moderators()->get();
-        });
-
         $canonical = canonical('articles', ['filter' => $filter, 'tag' => $activeTag?->slug()]);
-        $topAuthors = Cache::remember('topAuthors', now()->addMinutes(30), function () {
-            return User::mostSubmissionsInLastDays(365)->take(5)->get();
-        });
+        $topAuthors = Cache::remember(
+            'topAuthors', 
+            now()->addMinutes(30),
+            fn () => User::mostSubmissionsInLastDays(365)->take(5)->get()
+        );
 
         return view('articles.overview', [
             'pinnedArticles' => $pinnedArticles,
             'articles' => $articles->paginate(10),
             'tags' => $tags,
             'activeTag' => $activeTag,
             'filter' => $filter,
-            'moderators' => $moderators,
             'canonical' => $canonical,
             'topAuthors' => $topAuthors,
         ]);
@@ -155,7 +152,7 @@ public function update(ArticleRequest $request, Article $article)
 
         $article = $article->fresh();
 
-        if ($wasNotPreviouslySubmitted && $request->shouldBeSubmitted()) {
+        if ($wasNotPreviouslySubmitted && $request->shouldBeSubmitted() && $article->isNotApproved()) {
             $this->success('Thank you for submitting, unfortunately we can\'t accept every submission. You\'ll only hear back from us when we accept your article.');
         } else {
             $this->success('Article successfully updated!');

app/Jobs/CreateArticle.php

@@ -69,6 +69,6 @@ public function handle(): void
 
     private function canBeAutoApproved(): bool
     {
-        return $this->shouldBeSubmitted && $this->author->canVerifiedAuthorPublishMoreArticleToday();
+        return $this->shouldBeSubmitted && $this->author->canVerifiedAuthorPublishMoreArticlesToday();
     }
 }

app/Jobs/UpdateArticle.php

@@ -53,9 +53,12 @@ public function handle(): void
 
         if ($this->shouldUpdateSubmittedAt()) {
             $this->article->submitted_at = now();
+            $this->article->approved_at = $this->canBeAutoApproved() ? now() : null;
             $this->article->save();
 
-            event(new ArticleWasSubmittedForApproval($this->article));
+            if ($this->article->isAwaitingApproval()) {
+                event(new ArticleWasSubmittedForApproval($this->article));
+            }
         }
 
         $this->article->syncTags($this->tags);
@@ -69,4 +72,9 @@ private function shouldUpdateSubmittedAt(): bool
     {
         return $this->shouldBeSubmitted && $this->article->isNotSubmitted();
     }
+
+    private function canBeAutoApproved(): bool
+    {
+        return $this->article->author()->canVerifiedAuthorPublishMoreArticlesToday();
+    }
 }

app/Models/Article.php

@@ -196,7 +196,7 @@ public function isShared(): bool
 
     public function isAwaitingApproval(): bool
     {
-        return $this->isSubmitted() && $this->isNotApproved() && $this->isNotDeclined() && ! $this->author()->canVerifiedAuthorPublishMoreArticleToday();
+        return $this->isSubmitted() && $this->isNotApproved() && $this->isNotDeclined();
     }
 
     public function isNotAwaitingApproval(): bool

app/Models/User.php

@@ -317,7 +317,7 @@ public function isVerifiedAuthor(): bool
         return ! is_null($this->author_verified_at) || $this->isAdmin();
     }
 
-    public function canVerifiedAuthorPublishMoreArticleToday(): bool
+    public function canVerifiedAuthorPublishMoreArticlesToday(): bool
     {
         if ($this->isAdmin()) {
             return true;
@@ -364,13 +364,27 @@ public function scopeMostSolutions(Builder $query, ?int $inLastDays = null)
 
     public function scopeMostSubmissions(Builder $query, ?int $inLastDays = null)
     {
-        return $query->withCount(['articles as articles_count' => function ($query) use ($inLastDays) {
-            if ($inLastDays) {
-                $query->where('articles.approved_at', '>', now()->subDays($inLastDays));
-            }
+        return $query
+            ->selectRaw('users.*, COUNT(DISTINCT articles.id) AS articles_count')
+            ->join('articles', 'articles.author_id', '=', 'users.id')
+            ->where(function ($query) use ($inLastDays) {
+                if ($inLastDays) {
+                    $query->where('articles.approved_at', '>', now()->subDays($inLastDays));
+                }
+
+                return $query;
+            })
+            ->groupBy('users.id')
+            ->having('articles_count', '>', 0)
+            ->orderBy('articles_count', 'desc');
+
+        // return $query->withCount(['articles as articles_count' => function ($query) use ($inLastDays) {
+        //     if ($inLastDays) {
+        //         $query->where('articles.approved_at', '>', now()->subDays($inLastDays));
+        //     }
 
-            return $query;
-        }])->orderBy('articles_count', 'desc');
+        //     return $query;
+        // }])->orderBy('articles_count', 'desc');
     }
 
     public function scopeMostSolutionsInLastDays(Builder $query, int $days)

tests/Feature/ArticleTest.php

@@ -594,7 +594,7 @@
         'submitted_at' => now()->addMinutes(1), // after verification
     ]);
 
-    expect($author->canVerifiedAuthorPublishMoreArticleToday())->toBeFalse();
+    expect($author->canVerifiedAuthorPublishMoreArticlesToday())->toBeFalse();
 });
 
 test('verified authors skip the approval message when submitting new article', function () {