feat: [LAR-131] update locale selector

app/Actions/Discussion/ConvertDiscussionToThreadAction.php

@@ -28,7 +28,7 @@ public function execute(Discussion $discussion): Thread
 
             $discussion->delete();
 
-            app(NotifyUsersOfThreadConversion::class)->execute($thread);
+            app(NotifyUsersOfThreadConversionAction::class)->execute($thread);
 
             return $thread;
         });

app/Actions/Replies/CreateReply.php → app/Actions/Discussion/CreateDiscussionReplyAction.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace App\Actions\Replies;
+namespace App\Actions\Discussion;
 
 use App\Events\CommentWasAdded;
 use App\Gamify\Points\ReplyCreated;
 use App\Models\Reply;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
-final class CreateReply
+final class CreateDiscussionReplyAction
 {
     public function __invoke(string $body, User $user, Model $model): Reply
     {
@@ -22,7 +22,7 @@ public function __invoke(string $body, User $user, Model $model): Reply
         $user->givePoint(new ReplyCreated($model, $user));
 
         // On envoie un event pour une nouvelle réponse à tous les abonnés de la discussion
-        event(new CommentWasAdded($reply, $model));  // @phpstan-ignore-line
+        event(new CommentWasAdded($reply, $model)); // @phpstan-ignore-line
 
         return $reply;
     }

app/Actions/Replies/LikeReply.php → app/Actions/Discussion/LikeReplyAction.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace App\Actions\Replies;
+namespace App\Actions\Discussion;
 
 use App\Models\Reaction;
 use App\Models\Reply;
 use App\Models\User;
 
-final class LikeReply
+final class LikeReplyAction
 {
     public function __invoke(User $user, Reply $reply, string $reaction = 'love'): void
     {

app/Actions/Discussion/NotifyUsersOfThreadConversion.php → app/Actions/Discussion/NotifyUsersOfThreadConversionAction.php

@@ -10,7 +10,7 @@
 use App\Notifications\ThreadConvertedByCreator;
 use Illuminate\Support\Facades\Auth;
 
-final class NotifyUsersOfThreadConversion
+final class NotifyUsersOfThreadConversionAction
 {
     public function execute(Thread $thread): void
     {

app/Http/Controllers/SubscriptionController.php

@@ -18,7 +18,7 @@ public function unsubscribe(Subscribe $subscription): RedirectResponse
 
         session()->flash('status', __('Vous êtes maintenant désabonné de ce sujet.'));
 
-        return redirect()->route('forum.show', $thread->slug());
+        return redirect()->route('forum.show', $thread->slug);
     }
 
     public function redirect(int $id, string $type): RedirectResponse

app/Livewire/Components/ChangeLocale.php

@@ -6,7 +6,6 @@
 
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Pluralizer;
 use Livewire\Attributes\Computed;
 use Livewire\Component;
 
@@ -31,9 +30,7 @@ public function changeLocale(): void
         app()->setLocale($locale);
         session()->put('locale', $locale);
 
-        Pluralizer::useLanguage($this->currentLocale === 'fr' ? 'french' : 'english');
-
-        $this->redirectRoute('home', navigate: true);
+        $this->redirect(url()->previous(), navigate: true);
     }
 
     #[Computed]

app/Livewire/Components/Discussion/Comment.php

@@ -4,7 +4,7 @@
 
 namespace App\Livewire\Components\Discussion;
 
-use App\Actions\Replies\LikeReply;
+use App\Actions\Discussion\LikeReplyAction;
 use App\Models\Reply;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
@@ -32,7 +32,7 @@ public function toggleLike(): void
     {
         $this->authorize('like', $this->comment);
 
-        app()->call(LikeReply::class, [
+        app()->call(LikeReplyAction::class, [
             'user' => auth()->user(),
             'reply' => $this->comment,
         ]);

app/Livewire/Components/Discussion/Comments.php

@@ -4,7 +4,7 @@
 
 namespace App\Livewire\Components\Discussion;
 
-use App\Actions\Replies\CreateReply;
+use App\Actions\Discussion\CreateDiscussionReplyAction;
 use App\Models\Discussion;
 use App\Models\Reply;
 use Filament\Forms;
@@ -52,7 +52,7 @@ public function save(): void
     {
         $this->validate();
 
-        app()->call(CreateReply::class, [
+        app()->call(CreateDiscussionReplyAction::class, [
             'body' => data_get($this->form->getState(), 'body'),
             'user' => Auth::user(),
             'model' => $this->discussion,

app/Livewire/Components/Slideovers/ArticleForm.php

@@ -119,6 +119,18 @@ public function form(Form $form): Form
                 Forms\Components\Group::make()
                     ->schema([
                         Forms\Components\MarkdownEditor::make('body')
+                            ->toolbarButtons([
+                                'attachFiles',
+                                'blockquote',
+                                'bold',
+                                'bulletList',
+                                'codeBlock',
+                                'italic',
+                                'link',
+                                'orderedList',
+                                'strike',
+                                'table',
+                            ])
                             ->label(__('validation.attributes.content'))
                             ->fileAttachmentsDisk('public')
                             ->minLength(10)

app/Livewire/Pages/Articles/Index.php

@@ -7,22 +7,30 @@
 use App\Models\Article;
 use App\Models\Tag;
 use App\Traits\WithInfiniteScroll;
+use App\Traits\WithLocale;
 use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 final class Index extends Component
 {
     use WithInfiniteScroll;
+    use WithLocale;
+
+    public function mount(): void
+    {
+        $this->locale = config('app.locale');
+    }
 
     public function render(): View
     {
         return view('livewire.pages.articles.index', [
-            'articles' => Article::with(['tags', 'user', 'user.transactions'])
+            'articles' => Article::with(['tags', 'user', 'user.transactions']) // @phpstan-ignore-line
                 ->withCount(['views', 'reactions'])
                 ->orderByDesc('sponsored_at')
                 ->orderByDesc('published_at')
                 ->published()
                 ->notPinned()
+                ->forLocale($this->locale)
                 ->paginate($this->perPage),
             'tags' => Tag::query()->whereHas('articles', function ($query): void {
                 $query->published();

app/Livewire/Pages/Articles/SingleTag.php

@@ -7,19 +7,26 @@
 use App\Models\Article;
 use App\Models\Tag;
 use App\Traits\WithInfiniteScroll;
+use App\Traits\WithLocale;
 use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 final class SingleTag extends Component
 {
     use WithInfiniteScroll;
+    use WithLocale;
 
     public Tag $tag;
 
+    public function mount(): void
+    {
+        $this->locale = config('app.locale');
+    }
+
     public function render(): View
     {
         return view('livewire.pages.articles.tag', [
-            'articles' => Article::with(['tags', 'user', 'user.transactions'])
+            'articles' => Article::with(['tags', 'user', 'user.transactions']) // @phpstan-ignore-line
                 ->whereHas('tags', function ($query): void {
                     $query->where('id', $this->tag->id);
                 })
@@ -28,6 +35,7 @@ public function render(): View
                 ->orderByDesc('published_at')
                 ->published()
                 ->notPinned()
+                ->forLocale($this->locale)
                 ->paginate($this->perPage),
         ])->title($this->tag->name);
     }

app/Livewire/Pages/Discussions/Index.php

@@ -7,6 +7,7 @@
 use App\Models\Builders\DiscussionQueryBuilder;
 use App\Models\Discussion;
 use App\Models\Tag;
+use App\Traits\WithLocale;
 use Illuminate\Contracts\View\View;
 use Livewire\Attributes\Url;
 use Livewire\Component;
@@ -15,6 +16,7 @@
 
 final class Index extends Component
 {
+    use WithLocale;
     use WithoutUrlPagination;
     use WithPagination;
 
@@ -23,6 +25,11 @@ final class Index extends Component
 
     public string $sortBy = 'recent';
 
+    public function mount(): void
+    {
+        $this->locale = config('app.locale');
+    }
+
     public function validSort(string $sort): bool
     {
         return in_array($sort, [
@@ -50,8 +57,9 @@ public function tagExists(string $tag): bool
     public function render(): View
     {
         /** @var DiscussionQueryBuilder $query */
-        $query = Discussion::with('tags')
+        $query = Discussion::with('tags') // @phpstan-ignore-line
             ->withCount('replies')
+            ->forLocale($this->locale)
             ->notPinned();
 
         $tags = Tag::query()

app/Livewire/Pages/Forum/Index.php

@@ -6,6 +6,7 @@
 
 use App\Models\Channel;
 use App\Models\Thread;
+use App\Traits\WithLocale;
 use Illuminate\Contracts\View\View;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
@@ -19,6 +20,7 @@
 #[Layout('layouts.forum')]
 final class Index extends Component
 {
+    use WithLocale;
     use WithoutUrlPagination;
     use WithPagination;
 
@@ -48,6 +50,8 @@ public function mount(): void
         if ($this->channel) {
             $this->currentChannel = Channel::findBySlug($this->channel);
         }
+
+        $this->locale = config('app.locale');
     }
 
     #[On('channelUpdated')]
@@ -63,6 +67,12 @@ public function reloadThreads(?int $channelId): void
         $this->dispatch('render');
     }
 
+    #[On('redirectToLogin')]
+    public function redirectToLogin(): void
+    {
+        $this->redirectRoute('login', navigate: true);
+    }
+
     protected function applySearch(Builder $query): Builder
     {
         if ($this->search) {
@@ -87,6 +97,15 @@ protected function applySolved(Builder $query): Builder
         return $query;
     }
 
+    protected function applyLocale(Builder $query): Builder
+    {
+        if ($this->locale) {
+            $query->forLocale($this->locale); // @phpstan-ignore-line
+        }
+
+        return $query;
+    }
+
     protected function applyAuthor(Builder $query): Builder
     {
         if (Auth::check() && $this->user) {
@@ -125,6 +144,7 @@ public function render(): View
         $query = $this->applyChannel($query);
         $query = $this->applySearch($query);
         $query = $this->applySolved($query);
+        $query = $this->applyLocale($query);
         $query = $this->applyAuthor($query);
         $query = $this->applySubscribe($query);
         $query = $this->applyUnAnswer($query);

app/Models/Article.php

@@ -6,15 +6,14 @@
 
 use App\Contracts\ReactableInterface;
 use App\Models\Builders\ArticleQueryBuilder;
-use App\Models\Scopes\LocaleScope;
-use App\Traits\HasAuthor;
-use App\Traits\HasSlug;
+use App\Models\Traits\HasAuthor;
+use App\Models\Traits\HasLocaleScope;
+use App\Models\Traits\HasSlug;
 use App\Traits\HasTags;
 use App\Traits\Reactable;
 use App\Traits\RecordsActivity;
 use CyrildeWit\EloquentViewable\Contracts\Viewable;
 use CyrildeWit\EloquentViewable\InteractsWithViews;
-use Illuminate\Database\Eloquent\Attributes\ScopedBy;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
@@ -43,11 +42,11 @@
  * @property \Illuminate\Support\Carbon $updated_at
  * @property \Illuminate\Database\Eloquent\Collection | Tag[] $tags
  */
-#[ScopedBy([LocaleScope::class])]
 final class Article extends Model implements HasMedia, ReactableInterface, Viewable
 {
     use HasAuthor;
     use HasFactory;
+    use HasLocaleScope;
     use HasSlug;
     use HasTags;
     use InteractsWithMedia;

app/Models/Channel.php

@@ -5,7 +5,7 @@
 namespace App\Models;
 
 use App\Exceptions\CannotAddChannelToChild;
-use App\Traits\HasSlug;
+use App\Models\Traits\HasSlug;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;

app/Models/Discussion.php

@@ -9,10 +9,10 @@
 use App\Contracts\SpamReportableContract;
 use App\Contracts\SubscribeInterface;
 use App\Models\Builders\DiscussionQueryBuilder;
-use App\Models\Scopes\LocaleScope;
-use App\Traits\HasAuthor;
-use App\Traits\HasReplies;
-use App\Traits\HasSlug;
+use App\Models\Traits\HasAuthor;
+use App\Models\Traits\HasLocaleScope;
+use App\Models\Traits\HasReplies;
+use App\Models\Traits\HasSlug;
 use App\Traits\HasSpamReports;
 use App\Traits\HasSubscribers;
 use App\Traits\HasTags;
@@ -21,7 +21,6 @@
 use Carbon\Carbon;
 use CyrildeWit\EloquentViewable\Contracts\Viewable;
 use CyrildeWit\EloquentViewable\InteractsWithViews;
-use Illuminate\Database\Eloquent\Attributes\ScopedBy;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -42,11 +41,11 @@
  * @property User $user
  * @property Collection | SpamReport[] $spamReports
  */
-#[ScopedBy([LocaleScope::class])]
 final class Discussion extends Model implements ReactableInterface, ReplyInterface, SpamReportableContract, SubscribeInterface, Viewable
 {
     use HasAuthor;
     use HasFactory;
+    use HasLocaleScope;
     use HasReplies;
     use HasSlug;
     use HasSpamReports;

app/Models/Enterprise.php

@@ -5,8 +5,8 @@
 namespace App\Models;
 
 use App\Filters\Enterprise\EnterpriseFilters;
+use App\Models\Traits\HasSlug;
 use App\Traits\HasSettings;
-use App\Traits\HasSlug;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;