MERGE: resolve conflicts

Signed-off-by: jokob-sk <jokob.sk@gmail.com>

front/plugins/_publisher_ntfy/ntfy.py

@@ -14,8 +14,9 @@ sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"])
 import conf
 from const import confFileName, logPath
 from plugin_helper import Plugin_Objects, handleEmpty
+from utils.datetime_utils import timeNowDB
 from logger import mylog, Logger
-from helper import timeNowTZ, get_setting_value
+from helper import get_setting_value
 from models.notification_instance import NotificationInstance
 from database import DB
 from pytz import timezone
@@ -64,7 +65,7 @@ def main():
         # Log result
         plugin_objects.add_object(
             primaryId   = pluginName,
-            secondaryId = timeNowTZ(),            
+            secondaryId = timeNowDB(),            
             watched1    = notification["GUID"],
             watched2    = handleEmpty(response_text),            
             watched3    = response_status_code,