refactor: simplify timezone handling

Author: onmax

app/pages/index.vue

@@ -1,41 +1,27 @@
 <script setup lang="ts">
-import { differenceInCalendarDays } from 'date-fns'
 import { toZonedTime } from 'date-fns-tz'
 import OpeningHours from 'opening_hours'
 
 function getOpeningHoursStatus(
   expression: string | null | undefined,
   timezone: string | null | undefined,
-  latitude?: number,
-  longitude?: number,
   reference: Date = new Date(),
-): { isOpen: boolean, message: string, nextChange: Date | null, isTomorrow: boolean } {
+): { isOpen: boolean, message: string, nextChange: Date | null } {
   if (!expression || !timezone)
-    return { isOpen: false, message: 'Hours unavailable', nextChange: null, isTomorrow: false }
+    return { isOpen: false, message: 'Hours unavailable', nextChange: null }
 
   try {
-    const zoned = toZonedTime(reference, timezone)
-
-    const nominatiomData: any = { timezone }
-    if (Number.isFinite(latitude))
-      nominatiomData.lat = latitude
-    if (Number.isFinite(longitude))
-      nominatiomData.lon = longitude
-
-    const schedule = new OpeningHours(expression.trim(), nominatiomData)
-
-    const isOpen = schedule.getState(zoned)
-    const nextChange = schedule.getNextChange(zoned) || null
-    const nextIsTomorrow = nextChange
-      ? differenceInCalendarDays(toZonedTime(nextChange, timezone), toZonedTime(reference, timezone)) === 1
-      : false
+    const localDate = toZonedTime(reference, timezone)
+    const schedule = new OpeningHours(expression.trim())
 
+    const isOpen = schedule.getState(localDate)
+    const nextChange = schedule.getNextChange(localDate) || null
     const message = isOpen ? 'Open now' : 'Closed'
 
-    return { isOpen, message, nextChange, isTomorrow: nextIsTomorrow }
+    return { isOpen, message, nextChange }
   }
   catch {
-    return { isOpen: false, message: 'Hours unavailable', nextChange: null, isTomorrow: false }
+    return { isOpen: false, message: 'Hours unavailable', nextChange: null }
   }
 }
 
@@ -62,8 +48,6 @@ const { data: locations } = await useFetch('/api/search', {
       hoursStatus: getOpeningHoursStatus(
         location.openingHours,
         location.timezone,
-        location.latitude,
-        location.longitude,
       ),
     })) ?? []
   },
@@ -201,11 +185,7 @@ function removeCategory(categoryId: string) {
                     font-medium mb-0 mt-6
                   >
                     <template v-if="location.hoursStatus.nextChange">
-                      {{ location.hoursStatus.message }} · {{ location.hoursStatus.isOpen ? 'Closes' : 'Opens' }}
-                      <template v-if="location.hoursStatus.isTomorrow && !location.hoursStatus.isOpen">
-                        tomorrow
-                      </template>
-                      at
+                      {{ location.hoursStatus.message }} · {{ location.hoursStatus.isOpen ? 'Closes' : 'Opens' }} at
                       <NuxtTime
                         :datetime="location.hoursStatus.nextChange"
                         hour="numeric"

package.json

@@ -25,7 +25,6 @@
     "@nuxthub/core": "catalog:",
     "@vueuse/nuxt": "catalog:",
     "consola": "catalog:",
-    "date-fns": "catalog:",
     "date-fns-tz": "catalog:",
     "drizzle-orm": "catalog:",
     "nimiq-icons": "catalog:",

pnpm-lock.yaml

@@ -10,7 +10,6 @@ catalog:
   '@unocss/preset-attributify': ^66.5.2
   '@vueuse/nuxt': ^13.9.0
   consola: ^3.4.2
-  date-fns: ^4.1.0
   date-fns-tz: ^3.2.0
   drizzle-kit: latest
   drizzle-orm: latest

pnpm-workspace.yaml

@@ -1,8 +1,9 @@
 import type { Location } from '../../shared/types'
 import { consola } from 'consola'
+import { toZonedTime } from 'date-fns-tz'
 import { eq, sql } from 'drizzle-orm'
+import OpeningHours from 'opening_hours'
 import * as v from 'valibot'
-import { isOpenNow } from '../utils/opening-hours'
 
 const querySchema = v.object({
   lat: v.optional(v.pipe(
@@ -72,15 +73,19 @@ export default defineEventHandler(async (event): Promise<LocationResponse[]> =>
   }>(locations: T[]) => {
     if (!openNow)
       return locations
-    const toNumber = (value: unknown): number | undefined => {
-      const num = typeof value === 'number' ? value : Number(value)
-      return Number.isFinite(num) ? num : undefined
-    }
 
     return locations.filter((loc) => {
-      const lat = toNumber(loc.latitude)
-      const lon = toNumber(loc.longitude)
-      return isOpenNow(loc.openingHours, loc.timezone, lat, lon, referenceTime)
+      if (!loc.openingHours || !loc.timezone)
+        return false
+
+      try {
+        const localDate = toZonedTime(referenceTime, loc.timezone)
+        const schedule = new OpeningHours(loc.openingHours.trim())
+        return schedule.getState(localDate)
+      }
+      catch {
+        return false
+      }
     })
   }