Merge pull request #573 from prey/fix/loan-exact-time

Fix/loan exact time
prey · Apr 6, 2022 · 18c7fd2 · 18c7fd2
2 parents bb627b2 + f6c3da1
commit 18c7fd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/lib/agent/actions/triggers/index.js b/lib/agent/actions/triggers/index.js
@@ -493,13 +493,6 @@ exports.sync = (id, err, triggers, stored, cb) => {
       if (state == 6) logger.warn('Persisting action for ' + trigger.name);
       if (!trigger.persist) trigger.persist = 0;
 
-      trigger.automation_actions.forEach((automation, key) => {
-        if (automation.action.target == 'alert')
-          automation.action.options.alert_message = automation.action.options.alert_message.replace("'", '');
-        if (automation.action.target == 'lock')
-          automation.action.options.lock_message = automation.action.options.lock_message.replace("'", ''); 
-      });
-
       var data = {
         id: trigger.id,
         name: trigger.name,

diff --git a/lib/agent/utils/storage.js b/lib/agent/utils/storage.js
@@ -21,8 +21,7 @@ var types = {
     keys: ['id', 'command', 'target', 'options', 'started_resp', 'started', 'stopped_resp', 'stopped'],
     values: (data) => {
       return `'${data.id}', '${data.command}', '${data.target}', '${JSON.stringify(
-        data.options
-      )}' , 0, 'NULL', 0, 'NULL'`;
+        data.options).replace(/'/g, "")}' , 0, 'NULL', 0, 'NULL'`;
     }
   },
   geofences: {
@@ -46,7 +45,7 @@ var types = {
     values: (data) => {
       return `'${data.id}', '${data.name}', '${data.persist}', '${data.synced_at}', '${
         data.last_exec
-      }', '${JSON.stringify(data.automation_events)}', '${JSON.stringify(data.automation_actions)}'`;
+      }', '${JSON.stringify(data.automation_events).replace(/'/g, "")}', '${JSON.stringify(data.automation_actions).replace(/'/g, "")}'`;
     }
   },
   keys: {