applyConditions filter added and in working state. Needs to be made more generic by removing specific output target

core/runtime/applyconditions.py

@@ -0,0 +1,26 @@
+def applyConditions(definition, outputs):
+    if hasattr(definition, "filters"):
+        for filter in definition.filters:
+            print("DEBUG applyConditons filter item consumption")
+            print(outputs["event"])
+
+            item = outputs["event"]
+
+            #current_value = item[filter["filterkey"]]
+        
+            if filter["operator"] == ">=":
+                if item[filter["filterkey"]] >= filter["filtervalue"]:
+                    print("Applying filters")
+                    return True
+
+            if filter["operator"] == "==":
+                if item[filter["filterkey"]] == filter["filtervalue"]:
+                    print("Applying filters")
+                    return True
+
+            if filter["operator"] == "in":
+                if filter["filtervalue"] in outputs[filter["filterkey"]]:
+                    print("Applying filters")
+                    return True
+    
+    return False

core/runtime/outputs.py

@@ -20,7 +20,7 @@ def buildOutput(response, action, outputs):
                     for output_name, response_key in action.outputs.items():
                         if key == response_key:
                             outputs[output_name] = value
-        
+            #print (response_data)
         
         else:
             print("No response received"),

core/server/createlistener.py

@@ -1,5 +1,6 @@
 import json
 from core.runtime.outputs import buildOutput
+from core.runtime.applyconditions import applyConditions
 from core.execution.operation import buildOperation
 
 def buildListener(listener, self):
@@ -20,23 +21,31 @@ def buildListener(listener, self):
         #if applyConditions(listener, outputs)
         #    continue
         
-        print(outputs)
+        #print(outputs)
-        for event in outputs[listener.recursive["source"]]:
         
-            print("DEBUG")
-            print(listener.recursive["source"])
 
-            if "state_key" in event:
+        for item in outputs[listener.recursive["source"]]:
+            outputs[listener.recursive["label"]] = item
+
+            print("DEBUG item selection")
+            #print(listener.recursive["label"])
+            print(item)
+            print(outputs["event"])
+            
+            if applyConditions(listener, outputs):
                     continue
-            if event.get("sender") != "@lyncoln:loxthelion.com":
+
-                continue
+            #if "state_key" in event:
-            if "com.loxthelion.rmass_message_id" in event.get("content", {}):
+                #continue
-                continue
+            #if event.get("sender") != "@lyncoln:loxthelion.com":
-            if event.get("type") == "m.room.message":
+                #continue
+            #if "com.loxthelion.rmass_message_id" in event.get("content", {}):
+                #continue
+            #if event.get("type") == "m.room.message":
                 # Process and forward to RMASS
 
-                outputs = buildOperation(listener.execute, outputs)
+            #outputs = buildOperation(listener.execute, outputs)
-                
+            #print(event)    
 
         self.send_response(200)
         self.send_header("Content-Type", "application/json")

plugins/rmass/listeners/synapselistener.py

@@ -15,7 +15,24 @@ execute = rmassmessagepush
 recursive = {
     "source": "events",
     "reverse": False,
-    "label": "outboundmessage",
+    "label": "event",
 }
 
+filters = [
+    {
+        "filterkey": "event",
+        "operator": "in",
+        "filtervalue": "state_key",
+    },
+    {
+        "filterkey": "sender",
+        "operator": "!=",
+        "filtervalue": "@lyncoln:loxthelion.com",
+    },
+    {
+        "filterkey": "type",
+        "operator": "==",
+        "filtervalue": "m.room.message",
+    },
+]
 

savedata/tokens.json

@@ -1 +1 @@
-{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIyMjI5MjQsIm5iZiI6MTc5MjIyMjc0NCwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjIyMjgwNH0.ZAGwq0DlacX_VBfysDOu6pAlt1FzwccZe1zIlMZcozOs_C7jOiOhkC-o1BH4-UPxe_MniYKux3s5br6kwJHFqQ", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ4MTQ4MDQsIm5iZiI6MTc5MjIyMjc0NCwianRpIjoiRmVoVGM1cVFwQUQvRWtjYW1aLy85YllLbVB2ZEhPSXYyUE9YM25aTlhPRT0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjIyMjgwNCwic3ViIjoiMjM4MzAyIn0.BOPpuwg88qWk5A0XciE2wi_4mC6V9jvnQzWms0vxIkWctsGMQnhLABzuD8Zjofdf1qK5pQXxf9010SYV5c9r8A"}
+{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIyNDQyMTEsIm5iZiI6MTc5MjI0NDAzMSwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjI0NDA5MX0.9dWUqLM3EYm68Dvk4_BzlEgbxJky8OtJtufM7S9MqOFF3gB3waVX9Q4usf4fbpy1BokDou8EJ4y3mR26PDrQnQ", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ4MzYwOTEsIm5iZiI6MTc5MjI0NDAzMSwianRpIjoiUDNkY2JFeVRYRTBOc0tDTS9vNG5NMUtmRXVLdkdhNmlMRHBWS3AxSWQraz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjI0NDA5MSwic3ViIjoiMjM4MzAyIn0.ttcy40iHuhgVqXq1zgRre1Xxufs3m2auyKFTPsl9qHCFXIz6xixABmy4XEvTx5960qPlMtCtRiqOLWBf_-Bqcw"}