Merge pull request #1420 from shikorism/develop

Release 2025.2.0
shikorism · Feb 19, 2025 · de298c5 · de298c5
2 parents 54a6703 + 817b77b
commit de298c5
Show file tree

Hide file tree

Showing 3 changed files with 224 additions and 153 deletions.
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -63,7 +63,7 @@ public function profile($name)
         $countByDay = [];
         foreach ($countByDayQuery as $data) {
             $countByDay[] = [
-                't' => Carbon::createFromFormat('Y/m/d', $data->date)->timestamp,
+                't' => Carbon::createFromFormat('Y/m/d', $data->date, 'UTC')->startOfDay()->timestamp,
                 'count' => $data->count
             ];
         }
@@ -290,7 +290,7 @@ private function makeGraphData(User $user, CarbonInterface $dateSince = null, Ca
         }
 
         foreach ($groupByDay as $data) {
-            $date = Carbon::createFromFormat('Y/m/d', $data->date);
+            $date = Carbon::createFromFormat('Y/m/d', $data->date, 'UTC')->startOfDay();
             $yearAndMonth = $date->format('Y/m');
 
             $dailySum[] = ['t' => $date->timestamp, 'count' => $data->count];