From 4f865b4d2a4cc9b0293c1f90d26d9523ff409d82 Mon Sep 17 00:00:00 2001
From: Vari <variares7921@aol.com>
Date: Mon, 20 May 2024 04:42:37 +0200
Subject: [PATCH] Tried fixing some more timezone stuff and ban status check
 for the admin UI

---
 dist/app/Http/Controllers/Web/Admin/Tools/UsersController.php | 4 ++--
 dist/app/View/Components/Misc/BanStatus.php                   | 4 ++--
 dist/resources/views/admin/tools/user-details.blade.php       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dist/app/Http/Controllers/Web/Admin/Tools/UsersController.php b/dist/app/Http/Controllers/Web/Admin/Tools/UsersController.php
index 37b64b0..2effa61 100644
--- a/dist/app/Http/Controllers/Web/Admin/Tools/UsersController.php
+++ b/dist/app/Http/Controllers/Web/Admin/Tools/UsersController.php
@@ -118,8 +118,8 @@ public function banPost(User $user, Ban $ban, BanPostRequest $request) {
         }
 
         $ban->ban_reason = $request->reason;
-        $ban->start_date = $request->startDate;
-        $ban->end_date = $request->endDate;
+        $ban->start_date = Carbon::parse($request->startDate, 'Europe/Berlin');
+        $ban->end_date = Carbon::parse($request->endDate, 'Europe/Berlin');
         $ban->save();
 
         Session::flash('alert-success', 'Ban Edited Successfully!');
diff --git a/dist/app/View/Components/Misc/BanStatus.php b/dist/app/View/Components/Misc/BanStatus.php
index 7c1fed7..6bcdae8 100644
--- a/dist/app/View/Components/Misc/BanStatus.php
+++ b/dist/app/View/Components/Misc/BanStatus.php
@@ -24,8 +24,8 @@ public function __construct(public User $user)
         }
 
         $banCheckQuery = $user->bans()
-            ->whereDate('start_date', '<', Carbon::now()->toDateTimeString())
-            ->whereDate('end_date', '>', Carbon::now()->toDateTimeString());
+            ->where('start_date', '<', Carbon::now(config('app.timezone'))->toDateTimeString())
+            ->where('end_date', '>', Carbon::now(config('app.timezone'))->toDateTimeString());
 
         if ($banCheckQuery->exists())
             $this->banStatus = BanStatusEnum::Banned;
diff --git a/dist/resources/views/admin/tools/user-details.blade.php b/dist/resources/views/admin/tools/user-details.blade.php
index 2650d6d..89fc335 100644
--- a/dist/resources/views/admin/tools/user-details.blade.php
+++ b/dist/resources/views/admin/tools/user-details.blade.php
@@ -51,7 +51,7 @@
                             </div>
                             <div class="attribute">
                                 <label>Ban Status</label>
-                                <x-misc.ban-status class="border-none" />
+                                <x-misc.ban-status class="border-none" :$user />
                             </div>
                         </div>
                     </div>