MEP | merge develop into main (#302)

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

Author: 4 people

app/Filament/Resources/UserResource.php

@@ -59,7 +59,7 @@ public static function table(Table $table): Table
                     ->placeholder('N/A')
                     ->date(),
                 Tables\Columns\TextColumn::make(name: 'created_at')
-                    ->label(__('use.inscription'))
+                    ->label(__('user.inscription'))
                     ->date(),
             ])
             ->filters([
@@ -115,6 +115,38 @@ public static function table(Table $table): Table
             ])
             ->bulkActions([
                 Tables\Actions\DeleteBulkAction::make(),
+                Tables\Actions\BulkAction::make('delete_banned')
+                    ->label(__('Supprimer les utilisateurs bannis'))
+                    ->icon('heroicon-o-trash')
+                    ->color('danger')
+                    ->action(function ($records): void {
+
+                        $bannedUsers = $records->whereNotNull('banned_at');
+
+                        if ($bannedUsers->isEmpty()) {
+                            Notification::make()
+                                ->warning()
+                                ->title(__('actions.delete_none'))
+                                ->duration(5000)
+                                ->body(__('actions.delete_none_description'))
+                                ->send();
+
+                            return;
+                        }
+
+                        $bannedUsers->each(function (User $user): void {
+                            $user->delete();
+                        });
+
+                        Notification::make()
+                            ->success()
+                            ->title(__('actions.delete_success'))
+                            ->duration(5000)
+                            ->body(__('actions.delete_success_description'))
+                            ->send();
+                    })
+                    ->requiresConfirmation()
+                    ->deselectRecordsAfterCompletion(),
             ]);
     }
 

app/Filament/Resources/UserResource/Pages/ListUsers.php

@@ -18,8 +18,6 @@ public function getTabs(): array
             'all' => Tab::make(__('global.all')),
             'banned' => Tab::make(__('global.banned'))
                 ->modifyQueryUsing(fn ($query) => $query->isBanned()),
-            'unbanned' => Tab::make(__('global.unbanned'))
-                ->modifyQueryUsing(fn ($query) => $query->isNotBanned()),
         ];
     }
 }

app/Livewire/Components/ChangeLocale.php

@@ -11,7 +11,7 @@
 
 final class ChangeLocale extends Component
 {
-    public string $currentLocale;
+    public ?string $currentLocale = null;
 
     public function mount(): void
     {

app/Livewire/Pages/Articles/SinglePost.php

@@ -14,12 +14,12 @@ final class SinglePost extends Component
 {
     public Article $article;
 
-    public function mount(Article $article): void
+    public function mount(): void
     {
         /** @var User $user */
         $user = Auth::user();
 
-        $article = $article->load(['media', 'user'])->loadCount('views');
+        $article = $this->article->load(['media', 'user'])->loadCount('views');
 
         abort_unless(
             $article->isPublished() || ($user && $article->isAuthoredBy($user)) || ($user && $user->hasAnyRole(['admin', 'moderator'])), // @phpstan-ignore-line
@@ -42,7 +42,6 @@ public function mount(Article $article): void
             ->twitterTitle($article->title)
             ->twitterDescription($article->excerpt(150))
             ->twitterImage($image)
-            ->twitterSite('laravelcm')
             ->url($article->canonicalUrl());
 
         $this->article = $article;

app/Livewire/Pages/Discussions/SingleDiscussion.php

@@ -23,22 +23,20 @@ final class SingleDiscussion extends Component implements HasActions, HasForms
 
     public Discussion $discussion;
 
-    public function mount(Discussion $discussion): void
+    public function mount(): void
     {
-        views($discussion)->cooldown(now()->addHours(2))->record();
+        views($this->discussion)->cooldown(now()->addHours(2))->record();
 
         // @phpstan-ignore-next-line
         seo()
-            ->title($discussion->title)
-            ->description($discussion->excerpt(100))
+            ->title($this->discussion->title)
+            ->description($this->discussion->excerpt(100))
             ->image(asset('images/socialcard.png'))
-            ->twitterTitle($discussion->title)
-            ->twitterDescription($discussion->excerpt(100))
-            ->twitterImage(asset('images/socialcard.png'))
-            ->twitterSite('laravelcm')
+            ->twitterTitle($this->discussion->title)
+            ->twitterDescription($this->discussion->excerpt(100))
             ->withUrl();
 
-        $this->discussion = $discussion->load('tags', 'replies', 'reactions', 'replies.user');
+        $this->discussion->load('tags', 'replies', 'reactions', 'replies.user', 'user');
     }
 
     public function editAction(): Action

app/Livewire/Pages/Home.php

@@ -19,14 +19,6 @@ public function render(): View
     {
         $ttl = now()->addDays(2);
 
-        // @phpstan-ignore-next-line
-        seo()
-            ->description(__('pages/home.description'))
-            ->twitterDescription(__('pages/home.description'))
-            ->image(asset('/images/socialcard.png'))
-            ->twitterSite('laravelcm')
-            ->withUrl();
-
         return view('livewire.pages.home', [
             'plans' => Cache::remember(
                 key: 'plans',

app/Models/User.php

@@ -117,6 +117,10 @@ final class User extends Authenticatable implements FilamentUser, HasAvatar, Has
         'last_active_at' => 'datetime',
     ];
 
+    protected $with = [
+        'providers',
+    ];
+
     public function hasProvider(string $provider): bool
     {
         foreach ($this->providers as $p) {

app/Providers/AppServiceProvider.php

@@ -40,6 +40,16 @@ public function boot(): void
         $this->bootEloquentMorphs();
         $this->bootFilament();
 
+        // @phpstan-ignore-next-line
+        seo()
+            ->title(
+                default: __('pages/home.title'),
+                modify: fn (string $title) => $title.' | '.__('global.site_name')
+            )
+            ->description(default: __('global.site_description'))
+            ->image(default: fn () => asset('images/socialcard.png'))
+            ->twitterSite('@laravelcm');
+
         FilamentColor::register([
             'primary' => Color::Emerald,
             'danger' => Color::Red,

app/View/Composers/InactiveDiscussionsComposer.php

@@ -14,8 +14,8 @@ public function compose(View $view): void
     {
         $discussions = Cache::remember(
             key: 'inactive_discussions',
-            ttl: now()->addDays(3),
-            callback: fn () => Discussion::noComments()->limit(5)->get()
+            ttl: now()->addWeek(),
+            callback: fn () => Discussion::with('user')->noComments()->limit(5)->get()
         );
 
         $view->with('discussions', $discussions);

app/View/Composers/TopContributorsComposer.php

@@ -15,9 +15,9 @@ public function compose(View $view): void
         $topContributors = Cache::remember(
             key: 'contributors',
             ttl: now()->addWeek(),
-            callback: fn () => User::topContributors()
+            callback: fn () => User::query()->scopes('topContributors')
                 ->get()
-                ->filter(fn (User $contributor) => $contributor->loadCount('discussions')->discussions_count >= 1)
+                ->filter(fn (User $contributor) => $contributor->discussions_count >= 1)
                 ->take(5)
         );
 

composer.json

@@ -10,6 +10,7 @@
     "ext-json": "*",
     "archtechx/laravel-seo": "^0.10",
     "awcodes/filament-badgeable-column": "^2.3",
+    "barryvdh/laravel-debugbar": "^3.14",
     "blade-ui-kit/blade-heroicons": "^2.4",
     "codeat3/blade-phosphor-icons": "^2.0",
     "cyrildewit/eloquent-viewable": "^7.0",