fix: pinned questions updating updated_at

pinkary-project · Mar 22, 2024 · 82efc92 · 82efc92
1 parent 0d742e4
commit 82efc92
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/app/Livewire/Home.php b/app/Livewire/Home.php
@@ -35,7 +35,7 @@ public function render(): View
         return view('livewire.home', [
             'questions' => Question::where('answer', '!=', null)
                 ->where('is_reported', false)
-                ->orderByDesc('answered_at')
+                ->orderByDesc('updated_at')
                 ->simplePaginate($this->perPage),
         ]);
     }

diff --git a/app/Livewire/Questions/Index.php b/app/Livewire/Questions/Index.php
@@ -6,6 +6,7 @@
 
 use App\Models\Question;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 use Livewire\Attributes\Locked;
@@ -55,9 +56,11 @@ public function render(Request $request): View
             'questions' => $user
                 ->questionsReceived()
                 ->where('is_reported', false)
-                ->whereNotNull('answer')
+                ->when(! $user->is($request->user()), function (Builder $query, bool $_): void { // @phpstan-ignore-line
+                    $query->whereNotNull('answer');
+                })
                 ->orderByDesc('pinned')
-                ->orderByDesc('answered_at')
+                ->orderByDesc('updated_at')
                 ->simplePaginate($this->perPage),
         ]);
     }

diff --git a/app/Livewire/Questions/Show.php b/app/Livewire/Questions/Show.php
@@ -113,8 +113,8 @@ public function pin(): void
 
         $this->authorize('pin', $question);
 
-        $user->pinnedQuestion()->update(['pinned' => false]);
-        $question->update(['pinned' => true]);
+        Question::withoutTimestamps(fn () => $user->pinnedQuestion()->update(['pinned' => false]));
+        Question::withoutTimestamps(fn () => $question->update(['pinned' => true]));
 
         $this->dispatch('question.updated');
     }
@@ -134,7 +134,7 @@ public function unpin(): void
 
         $this->authorize('update', $question);
 
-        $question->update(['pinned' => false]);
+        Question::withoutTimestamps(fn () => $question->update(['pinned' => false]));
 
         $this->dispatch('question.updated');
     }