timestamp cleanup

server/models/device_instance.py

@@ -18,7 +18,7 @@ from db.authoritative_handler import (
     unlock_fields
 )
 from helper import is_random_mac, get_setting_value
-from utils.datetime_utils import timeNowDB
+from utils.datetime_utils import timeNowUTC
 
 
 class DeviceInstance:
@@ -407,7 +407,7 @@ class DeviceInstance:
 
     def getDeviceData(self, mac, period=""):
         """Fetch device info with children, event stats, and presence calculation."""
-        now = timeNowDB()
+        now = timeNowUTC()
 
         # Special case for new device
         if mac.lower() == "new":
@@ -639,8 +639,8 @@ class DeviceInstance:
                     data.get("devSkipRepeated") or 0,
                     data.get("devIsNew") or 0,
                     data.get("devIsArchived") or 0,
-                    data.get("devLastConnection") or timeNowDB(),
-                    data.get("devFirstConnection") or timeNowDB(),
+                    data.get("devLastConnection") or timeNowUTC(),
+                    data.get("devFirstConnection") or timeNowUTC(),
                     data.get("devLastIP") or "",
                     data.get("devGUID") or "",
                     data.get("devCustomProps") or "",

server/models/event_instance.py

@@ -2,7 +2,7 @@ from datetime import datetime, timedelta
 from logger import mylog
 from database import get_temp_db_connection
 from db.db_helper import row_to_json, get_date_from_period
-from utils.datetime_utils import ensure_datetime
+from utils.datetime_utils import ensure_datetime, timeNowUTC
 
 
 # -------------------------------------------------------------------------------
@@ -43,7 +43,7 @@ class EventInstance:
 
     # Get events in the last 24h
     def get_recent(self):
-        since = datetime.now() - timedelta(hours=24)
+        since = timeNowUTC(as_string=False) - timedelta(hours=24)
         conn = self._conn()
         rows = conn.execute("""
             SELECT * FROM Events
@@ -59,7 +59,7 @@ class EventInstance:
             mylog("warn", f"[Events] get_by_hours({hours}) -> invalid value")
             return []
 
-        since = datetime.now() - timedelta(hours=hours)
+        since = timeNowUTC(as_string=False) - timedelta(hours=hours)
         conn = self._conn()
         rows = conn.execute("""
             SELECT * FROM Events
@@ -93,14 +93,14 @@ class EventInstance:
                 eve_EventType, eve_AdditionalInfo,
                 eve_PendingAlertEmail, eve_PairEventRowid
             ) VALUES (?,?,?,?,?,?,?)
-        """, (mac, ip, datetime.now(), eventType, info,
+        """, (mac, ip, timeNowUTC(as_string=False), eventType, info,
               1 if pendingAlert else 0, pairRow))
         conn.commit()
         conn.close()
 
     # Delete old events
     def delete_older_than(self, days: int):
-        cutoff = datetime.now() - timedelta(days=days)
+        cutoff = timeNowUTC(as_string=False) - timedelta(days=days)
         conn = self._conn()
         result = conn.execute("DELETE FROM Events WHERE eve_DateTime < ?", (cutoff,))
         conn.commit()

server/models/notification_instance.py

@@ -16,7 +16,7 @@ from helper import (
     getBuildTimeStampAndVersion,
 )
 from messaging.in_app import write_notification
-from utils.datetime_utils import timeNowDB, get_timezone_offset
+from utils.datetime_utils import timeNowUTC, get_timezone_offset
 
 
 # -----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ class NotificationInstance:
             self.HasNotifications = True
 
         self.GUID               = str(uuid.uuid4())
-        self.DateTimeCreated    = timeNowDB()
+        self.DateTimeCreated    = timeNowUTC()
         self.DateTimePushed     = ""
         self.Status             = "new"
         self.JSON               = JSON
@@ -107,7 +107,7 @@ class NotificationInstance:
             mail_html = mail_html.replace("NEW_VERSION", newVersionText)
 
             # Report "REPORT_DATE" in Header & footer
-            timeFormated = timeNowDB()
+            timeFormated = timeNowUTC()
             mail_text = mail_text.replace("REPORT_DATE", timeFormated)
             mail_html = mail_html.replace("REPORT_DATE", timeFormated)
 
@@ -208,7 +208,7 @@ class NotificationInstance:
     # Updates the Published properties
     def updatePublishedVia(self, newPublishedVia):
         self.PublishedVia = newPublishedVia
-        self.DateTimePushed = timeNowDB()
+        self.DateTimePushed = timeNowUTC()
         self.upsert()
 
     # create or update a notification
@@ -274,7 +274,7 @@ class NotificationInstance:
                     SELECT eve_MAC FROM Events
                         WHERE eve_PendingAlertEmail = 1
                     )
-                """, (timeNowDB(),))
+                """, (timeNowUTC(),))
 
         self.db.sql.execute("""
             UPDATE Events SET eve_PendingAlertEmail = 0

server/models/user_events_queue_instance.py

@@ -3,7 +3,7 @@ import uuid
 
 from const import logPath
 from logger import mylog
-from utils.datetime_utils import timeNowDB
+from utils.datetime_utils import timeNowUTC
 
 
 class UserEventsQueueInstance:
@@ -90,7 +90,7 @@ class UserEventsQueueInstance:
                 success - True if the event was successfully added.
                 message - Log message describing the result.
         """
-        timestamp = timeNowDB()
+        timestamp = timeNowUTC()
         # Generate GUID
         guid = str(uuid.uuid4())