diff --git a/core/runtime/firewall.py b/core/runtime/firewall.py index 6485ea9..912463a 100644 --- a/core/runtime/firewall.py +++ b/core/runtime/firewall.py @@ -20,9 +20,11 @@ def buildFirewall(listener, outputs): status_code = filter.get("status_code", 200) if filter.get("execute", False): - from core.apirequest.execute import executeRequest + #from core.apirequest.execute import executeRequest + from core.execution.createthread import buildThread - response = executeRequest(filter["execute"], outputs, resolved) + #response = executeRequest(filter["execute"], outputs, resolved) + thread = buildThread(filter["execute"]) if firewall_log: logging.info(filter.get("print")) diff --git a/plugins/rmass/actions/synapsenotify.py b/plugins/rmass/actions/synapsenotify.py index 0918322..f070a1d 100644 --- a/plugins/rmass/actions/synapsenotify.py +++ b/plugins/rmass/actions/synapsenotify.py @@ -10,16 +10,16 @@ showstatus = True resolve = { "get": { - "sender": ["room_name"], - "event_id": ["outmessageitem", "event_id"], - "room_id": ["outmessageitem", "room_id"], + #"sender": ["events"], + "event_id": ["events", 0, "event_id"], + "room_id": ["events", 0, "room_id"], }, - "deconstruct": { - "sender" : [ - "#rmass_dm_", - ":loxthelion.com", - ], - }, +# "deconstruct": { +# "sender" : [ +# "#rmass_dm_", +# ":loxthelion.com", +# ], +# }, } keys = [