1 files changed, 33 insertions, 2 deletions
diff --git a/src/lib/init.ts b/src/lib/init.ts
index 03c9b63..99730e9 100644
--- a/src/lib/init.ts
+++ b/src/lib/init.ts
@@ -3,7 +3,7 @@
 //
 
 // imports
-import { validate, onPress } from "@lib/helpers/action.ts"
+import { validate, onPress, onMotion } from "@lib/helpers/action.ts"
 import { addListener } from "@lib/mqtt.ts"
 import allActions, { ACTION_ON_ACTION } from "@lib/config/actions.ts"
 import allDevices from "@lib/config/devices.ts"
@@ -11,6 +11,9 @@ import allDevices from "@lib/config/devices.ts"
 // initialise actions
 function _initActions() {
 
+    global.activeActions = []
+    global.activeUndos = []
+
     if (!allActions || allActions.length < 1) return
 
     allActions.forEach((action) => {
@@ -24,7 +27,21 @@ function _initActions() {
             return
         }
 
-        const topic = `${onDevice.mqtt}/action`
+        // todo: use a single callback / listener & just subscribe to each topic
+        // first param on return is the topic so case / switch that
+
+        let topic
+
+        if (["on", "off", "toggle"].includes(action.on)) {
+
+            topic = `${onDevice.mqtt}/action`
+
+        } else {
+
+            topic = onDevice.mqtt
+
+        }
+
         const callback = (message) => {
 
             const messageAction = message.toString()
@@ -52,6 +69,20 @@ function _initActions() {
 
                     break
 
+                default:
+
+                    // probbaly a json string
+                    const jsonMessageAction = JSON.parse(messageAction)
+
+                    if (jsonMessageAction?.presence !== undefined && action.on.action === "motion") {
+
+                        onMotion(action, jsonMessageAction)
+
+                    } else {
+
+                        console.warn(`?> unknown action: ${messageAction} from ${topic}`)
+
+                    }
             }
         }