From 39b4356ea66e77351d1eb7e046ea8679b9789591 Mon Sep 17 00:00:00 2001
From: Massedil <massedil-framagit.org@msd.im>
Date: Fri, 13 Dec 2024 16:23:09 +0100
Subject: [PATCH] fix(home): ensure event hour displays correctly with timezone

Timezone parameter is now mandatory for <start-time-icon>.

Solves #1618
---
 src/components/Event/EventCard.vue     | 1 +
 src/components/Event/StartTimeIcon.vue | 6 +++---
 src/views/Event/EventView.vue          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/Event/EventCard.vue b/src/components/Event/EventCard.vue
index 8c6a56243..66bcd8c9f 100644
--- a/src/components/Event/EventCard.vue
+++ b/src/components/Event/EventCard.vue
@@ -81,6 +81,7 @@
             :small="true"
             v-if="!mergedOptions.hideDate && event.options.showStartTime"
             :date="event.beginsOn.toString()"
+            :timezone="event.options.timezone"
           />
         </div>
         <span
diff --git a/src/components/Event/StartTimeIcon.vue b/src/components/Event/StartTimeIcon.vue
index 38abc97bc..1d55b6600 100644
--- a/src/components/Event/StartTimeIcon.vue
+++ b/src/components/Event/StartTimeIcon.vue
@@ -20,16 +20,16 @@ import Clock from "vue-material-design-icons/ClockTimeTenOutline.vue";
 const props = withDefaults(
   defineProps<{
     date: string;
-    timezone?: string;
+    timezone: string | null;
     small?: boolean;
   }>(),
-  { small: false, timezone: "Etc/UTC" }
+  { small: false }
 );
 
 const dateObj = computed<Date>(() => new Date(props.date));
 
 const time = computed<string>(() =>
-  formatTimeString(props.date, props.timezone)
+  formatTimeString(props.date, props.timezone ?? undefined)
 );
 
 const smallStyle = computed<string>(() => (props.small ? "0.9" : "2"));
diff --git a/src/views/Event/EventView.vue b/src/views/Event/EventView.vue
index c8b275991..e8b81c694 100755
--- a/src/views/Event/EventView.vue
+++ b/src/views/Event/EventView.vue
@@ -24,7 +24,7 @@
         >
           <start-time-icon
             :date="event.beginsOn.toString()"
-            :timezone="event.options.timezone ?? undefined"
+            :timezone="event.options.timezone"
             class="absolute right-3 -top-16"
           />
         </div>