From d4266baf253aaa11b6938be85a4502d659bcb663 Mon Sep 17 00:00:00 2001
From: ztimson <zaktimson@gmail.com>
Date: Wed, 24 Jun 2026 15:36:18 -0400
Subject: [PATCH] Added daytime property

---
 server/src/influx.mjs      | 3 +--
 server/src/openweather.mjs | 2 ++
 server/src/server.mjs      | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/influx.mjs b/server/src/influx.mjs
index cc565d5..904c1b9 100644
--- a/server/src/influx.mjs
+++ b/server/src/influx.mjs
@@ -57,11 +57,10 @@ export async function queryCurrent() {
       |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")
   `;
 	const rows = await query(flux);
-	const result = {};
+	const result = {time: new Date()};
 	for(const row of rows) {
 		Object.assign(result, extractRow(row));
 	}
-	console.log(result);
 	return result;
 }
 
diff --git a/server/src/openweather.mjs b/server/src/openweather.mjs
index 7914025..7375501 100644
--- a/server/src/openweather.mjs
+++ b/server/src/openweather.mjs
@@ -62,6 +62,8 @@ export function getWeatherCondition(data) {
   }
 
   // Cloud-based conditions
+  if(data.daytime == null)
+    data.daytime = data.time >= new Date(data.sunrise) && data.time <= new Date(data.sunset);
   const isDay = data.daytime;
   const dayNight = isDay ? "d" : "n";
 
diff --git a/server/src/server.mjs b/server/src/server.mjs
index bfb5b09..9f171f3 100644
--- a/server/src/server.mjs
+++ b/server/src/server.mjs
@@ -41,13 +41,12 @@ function filterArr(arr, fields) {
 app.get('/api/current', async (req, res) => {
 	const { fields } = req.query
 	const [sensors, coords] = await Promise.all([queryCurrent(), getCoords()])
-	const condition = getWeatherCondition(sensors)
 	const space     = getCelestialCurrent(coords.latitude, coords.longitude)
+	const condition = getWeatherCondition(Object.assign(sensors, space))
 	const { summary } = await ensureForecast()
 
 	// Merge forecast summary fields — sensor readings take priority
 	const merged = {
-		time: new Date(),
 		...(summary ? {
 			precipitation_chance:   summary.precipitation_chance,
 			temperature_max: summary.temperature_max,