Merge branch 'main' into docker

compass/app/Http/Controllers/IndieAuth.php

@@ -164,7 +164,9 @@ class IndieAuth extends BaseController
     // Create the user record if it doesn't exist yet
     $user = DB::table('users')->where('url','=',$url)->first();
     if($user) {
-      DB::update('UPDATE users SET last_login = ?', [date('Y-m-d H:i:s')]);
+      DB::table('users')->where('id', $user->id)->update([
+        'last_login' => date('Y-m-d H:i:s')
+      ]);
       session(['user_id' => $user->id]);
     } else {
       $user_id = DB::table('users')->insertGetId([

compass/resources/views/map.blade.php

@@ -33,9 +33,18 @@
   <div class="scroll">
   <?php
   $days = array_fill(1,31,['#']);
-  $start = new DateTime('2008-05-30T00:00:00-0800');
+
+  try {
+    $tz = new DateTimeZone($database->timezone);
+  } catch(Exception $e) {
+    $tz = new DateTimeZone('UTC');
+  }
+
+  $start = new DateTime($database->created_at);
   $end = new DateTime();
-  $end->setTimeZone(new DateTimeZone($database->timezone));
+  $start->setTimeZone($tz);
+  $end->setTimeZone($tz);
+
   $i = clone $start;
   while((int)$i->format('Y') <= (int)$end->format('Y') && (int)$i->format('M') <= (int)$end->format('M')) {
     ?>