Merge branch 'main' into filament-admin

Author: theHocineSaad

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
           coverage: none
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '22.x'
 

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/Http/Controllers/Auth/RegisterController.php

@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\RegisterRequest;
 use App\Jobs\RegisterUser;
+use App\Jobs\UpdateUserIdenticonStatus;
 use App\Models\User;
 use App\Providers\AppServiceProvider;
 use Illuminate\Auth\Events\Registered;
@@ -71,6 +72,10 @@ protected function create(RegisterRequest $request): User
     {
         $this->dispatchSync(RegisterUser::fromRequest($request));
 
-        return User::findByEmailAddress($request->emailAddress());
+        $user = User::findByEmailAddress($request->emailAddress());
+
+        $this->dispatch(new UpdateUserIdenticonStatus($user));
+
+        return $user;
     }
 }

app/Http/Controllers/Forum/TagsController.php

@@ -7,6 +7,7 @@
 use App\Models\Tag;
 use App\Models\Thread;
 use App\Models\User;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\View\View;
 
 class TagsController extends Controller
@@ -35,8 +36,12 @@ public function show(Tag $tag): View
         }
 
         $tags = Tag::orderBy('name')->get();
-        $topMembers = User::mostSolutionsInLastDays(365)->take(5)->get();
-        $moderators = User::moderators()->get();
+        $topMembers = Cache::remember('topMembers', now()->addHour(), function () {
+            return User::mostSolutionsInLastDays(365)->take(5)->get();
+        });
+        $moderators = Cache::remember('moderators', now()->addDay(), function () {
+            return User::moderators()->get();
+        });
         $canonical = canonical('forum.tag', [$tag->name, 'filter' => $filter]);
 
         return view('forum.overview', compact('threads', 'filter', 'tags', 'topMembers', 'moderators', 'canonical') + ['activeTag' => $tag]);

app/Http/Controllers/Forum/ThreadsController.php

@@ -61,10 +61,10 @@ public function overview()
         }
 
         $tags = Tag::orderBy('name')->get();
-        $topMembers = Cache::remember('topMembers', now()->addMinutes(30), function () {
+        $topMembers = Cache::remember('topMembers', now()->addHour(), function () {
             return User::mostSolutionsInLastDays(365)->take(5)->get();
         });
-        $moderators = Cache::remember('moderators', now()->addMinutes(30), function () {
+        $moderators = Cache::remember('moderators', now()->addDay(), function () {
             return User::moderators()->get();
         });
         $canonical = canonical('forum', ['filter' => $filter]);
@@ -74,7 +74,7 @@ public function overview()
 
     public function show(Thread $thread)
     {
-        $moderators = Cache::remember('moderators', now()->addMinutes(30), function () {
+        $moderators = Cache::remember('moderators', now()->addDay(), function () {
             return User::moderators()->get();
         });
 

app/Http/Controllers/HomeController.php

@@ -13,43 +13,34 @@ class HomeController extends Controller
 {
     public function show()
     {
-        $communityMembers = Cache::remember('communityMembers', now()->addMinutes(5), function () {
-            return User::withCounts()
-                ->hasActivity()
-                ->notBanned()
-                ->inRandomOrder()
-                ->take(100)
-                ->get()
-                ->chunk(20);
-        });
+        $communityMembers = Cache::remember(
+            'communityMembers',
+            now()->addMinutes(5),
+            fn () => User::notBanned()->withAvatar()->inRandomOrder()->take(100)->get()->chunk(20)
+        );
 
-        $totalUsers = Cache::remember('totalUsers', now()->addDay(), function () {
-            return number_format(User::notBanned()->count());
-        });
+        $totalUsers = Cache::remember('totalUsers', now()->addDay(), fn () => number_format(User::notBanned()->count()));
 
-        $totalThreads = Cache::remember('totalThreads', now()->addDay(), function () {
-            return number_format(Thread::count());
-        });
+        $totalThreads = Cache::remember('totalThreads', now()->addDay(), fn () => number_format(Thread::count()));
 
-        $totalReplies = Cache::remember('totalReplies', now()->addDay(), function () {
-            return number_format(Reply::count());
-        });
+        $totalReplies = Cache::remember('totalReplies', now()->addDay(), fn () => number_format(Reply::count()));
 
-        $latestThreads = Cache::remember('latestThreads', now()->addHour(), function () {
-            return Thread::whereNull('solution_reply_id')
+        $latestThreads = Cache::remember(
+            'latestThreads',
+            now()->addHour(),
+            fn () => Thread::whereNull('solution_reply_id')
                 ->whereBetween('threads.created_at', [now()->subMonth(), now()])
                 ->unlocked()
                 ->inRandomOrder()
                 ->limit(3)
-                ->get();
-        });
+                ->get()
+        );
 
-        $latestArticles = Cache::remember('latestArticles', now()->addHour(), function () {
-            return Article::published()
-                ->recent()
-                ->limit(4)
-                ->get();
-        });
+        $latestArticles = Cache::remember(
+            'latestArticles',
+            now()->addHour(),
+            fn () => Article::published()->recent()->limit(4)->get()
+        );
 
         return view('home', [
             'communityMembers' => $communityMembers,

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/UnVerifyAuthor.php

@@ -6,7 +6,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 
-class UnVerifyAuthor implements ShouldQueue
+final class UnVerifyAuthor implements ShouldQueue
 {
     use Queueable;
 

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/Jobs/UpdateUserIdenticonStatus.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\User;
+use App\Social\GithubUserApi;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+final class UpdateUserIdenticonStatus implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(protected User $user) {}
+
+    public function handle(GithubUserApi $github): void
+    {
+        $hasIdenticon = $github->hasIdenticon($this->user->githubId());
+
+        User::withoutSyncingToSearch(function () use ($hasIdenticon) {
+            $this->user->update(['github_has_identicon' => $hasIdenticon]);
+        });
+    }
+}