Fixed HTML message formatting, Extended resolver for get, construct and transform functions, Added entire message history with aliasing for personal matrix account

core/execution/action/action.py

@@ -7,7 +7,7 @@ def buildAction (action, outputs):
 
     if hasattr(action, "recursive"):
         items = outputs[action.recursive["source"]]
-        reverse = action.recursive.get("reversed", False)
+        reverse = action.recursive.get("reverse", False)
         
         if reverse:
             items = reversed(items)

core/runtime/resolver.py

@@ -1,11 +1,29 @@
 def resolveItem(action, item):
     resolved = {}
     if hasattr(action, "resolve"):
-        for label, keys in action.resolve.items():
+        for label, keys in action.resolve["get"].items():
             target = item
 
             for key in keys:
                 target = target[key]
 
             resolved[label] = target
+        if "construct" in action.resolve:
+            for label2, piece in action.resolve["construct"].items():
+                constructed = ""
+
+                for item in piece:
+                    if isinstance(item, dict):
+                        for key, value in item.items():
+                            item = resolved[value]
+
+                    constructed += str(item)
+
+                resolved[label2] = constructed
+        if "transform" in action.resolve:
+            for source, mutation in action.resolve["transform"].items():
+                for key, value in mutation.items():
+                    if resolved[source] == key:
+                        resolved[source] = value
+
     return resolved

core/server/server.py

@@ -8,7 +8,28 @@ from .createresponse import buildResponse
 
 port = int(os.environ.get("SERVER_PORT", 19001))
 
+from http.server import HTTPServer, BaseHTTPRequestHandler
+
+class RequestHandler(BaseHTTPRequestHandler):
+    def do_POST(self):
+        print("POST request received")
+
+        self.send_response(200)
+        self.send_header("Content-Type", "application/json")
+        self.end_headers()
+
+        self.wfile.write(b'{"status": "ok"}')
+
 def startServer():
+    server = HTTPServer(("127.0.0.1", port), RequestHandler)
+
+    print(f"Server listening on port {port}")
+
+    server.serve_forever()
+
+
+
+def startServer2():
     server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
     server.bind(("0.0.0.0", port))
@@ -22,10 +43,6 @@ def startServer():
         print("Accepting connections")
         connection.settimeout(30)
 
-        class RequestHandler(BaseHTTPRequestHandler):
-            def do_POST(self):
-                print("POST request received")
-            
         try:
             while True:
                 data = connection.recv(4096)

plugins/rmass/actions/getmessage.py

@@ -8,18 +8,15 @@ method = "GET"
 
 #Used to resolve path for recursive handling. Path location must match the location of the recursiveset data from pullmessage operation
 resolve = {
+    "get": {
         "path": ["messageheaders", "id"],
     }
+}
 
 #To add resolution suffix, second item must be a dictionary. References the "path" library under resolved
 path = [
     "https://rentmasseur.com/api/v1/mailbox/",
     {"resolved": "path"},
-    #{
-    #    "output": "id",
-    #    #"keys": [0, "id"]
-    #    "keys": "id"
-    #}
 ]
 
 headers = {
@@ -41,8 +38,8 @@ select = {
         "value": False,
     },
     "exclude": {
-        "key": "senderId",
-        "value": 238302,
+        "key": {},
+        "value": {},
     }
 }
 

plugins/rmass/actions/refresh_tokens.py

@@ -18,8 +18,6 @@ headers = {
     },
 }
 
-#domainname="rentmasseur.com"
-
 cookies = {
     "accessToken": {
         "output": "access_token",

plugins/rmass/actions/synapseassignspace.py

@@ -7,11 +7,14 @@ kind = "action"
 showstatus = True
 
 resolve = {
+    "get": {
         "sender": ["messages", 0, "senderId"],
         "space_id": ["space_id"],
         "username": ["profile", "username"],
         "room_id": ["dmroom_id"],
+    },
 }
+
 keys = [
     {
         "keytitle": "via",

plugins/rmass/actions/synapseassignusername.py

@@ -9,9 +9,19 @@ showstatus = True
 astoken = os.environ["AS_TOKEN"]
 
 resolve = {
+    "get": {
         "sender": ["messages", 0, "senderId"],
         "username": ["profile", "username"],
+    },
+    "construct": {
+        "matrixuser": [
+            "@rmass_",
+            {"resolved": "sender"},
+            ":loxthelion.com",
+        ],
+    },
 }
+
 keys = [
     {
         "keytitle": "displayname",
@@ -24,11 +34,10 @@ keys = [
 method = "PUT"
 
 path = [
-    "https://loxthelion.com/_matrix/client/v3/profile/@rmass_",
-    {"resolved": "sender"},
-    ":loxthelion.com/displayname?user_id=@rmass_",
-    {"resolved": "sender"},
-    ":loxthelion.com"
+    "https://loxthelion.com/_matrix/client/v3/profile/",
+    {"resolved": "matrixuser"},
+    "/displayname?user_id=",
+    {"resolved": "matrixuser"},
 ]
 
 headers = {

plugins/rmass/actions/synapsecreatedmroom.py

@@ -7,8 +7,21 @@ kind = "action"
 showstatus = True
 
 resolve = {
+    "get": {
         "sender": ["messages", 0, "senderId"],
         "username": ["profile", "username"],
+    },
+    "construct": {
+        "matrixuser": [
+            "@rmass_",
+            {"resolved": "sender"},
+            ":loxthelion.com",
+        ],
+        "matrixdm": [
+            "rmass_dm_",
+            {"resolved": "sender"},
+        ],
+    },
 }
 
 keys = [
@@ -21,8 +34,7 @@ keys = [
     {
         "keytitle": "room_alias_name",
         "keyvalue": {
-            "resolved": "sender",
-            "prefix": "rmass_dm_",
+            "resolved": "matrixdm",
         },
     },
     {
@@ -55,9 +67,9 @@ keys = [
 method = "POST"
 
 path = [
-    "https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_",
-    {"resolved": "sender"},
-    ":loxthelion.com",
+    "https://loxthelion.com/_matrix/client/v3/createRoom?user_id=",
+    {"resolved": "matrixuser"},
+    #":loxthelion.com",
 ]
 
 headers = {

plugins/rmass/actions/synapsecreatespace.py

@@ -7,11 +7,19 @@ kind = "action"
 showstatus = True
 
 resolve = {
-    "sender": ["messages", 0, "senderId"],
-    #"messageid": ["message", "id"],
-    "username": ["profile", "username"],
+    "get": {
+        #"sender": ["messages", 0, "senderId"],
+        #"username": ["profile", "username"],
         "locationname": ["profile", "location"],
         "locationcode": ["profile", "searchCity"],
+    },
+    "construct": {
+        "matrixspacealias": [
+            "rmass_space_",
+            {"resolved": "locationcode"},
+            #"%3Aloxthelion.com",
+        ],
+    },      
 }
 keys = [
     {
@@ -23,8 +31,8 @@ keys = [
     {
         "keytitle": "room_alias_name",
         "keyvalue": {
-            "resolved": "locationcode",
-            "prefix": "rmass_space_",
+            "resolved": "matrixspacealias",
+            #"prefix": "rmass_space_",
         },
     },
     {
@@ -46,7 +54,7 @@ keys = [
         #"keyvalue": {
             #"users": {
                 #"@lyncoln:loxthelion.com": 100,
-                #"@rmass_:loxthelion.com": 100,
+                #"@rmass_*:loxthelion.com": 100,
             #},
         #},
     #}
@@ -55,9 +63,6 @@ keys = [
 method = "POST"
 
 path = [
-    #"https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_",
-    #{"resolved": "sender"},
-    #":loxthelion.com",
     "https://loxthelion.com/_matrix/client/v3/createRoom?user_id=@rmass_bridge:loxthelion.com"
 ]
 

plugins/rmass/actions/synapsegetroomid.py

@@ -7,15 +7,23 @@ kind = "action"
 showstatus = True
 
 resolve = {
+    "get": {
         "sender": ["messages", 0, "senderId"],
+    },
+    "construct": {
+        "matrixdm": [
+            "%23rmass_dm_",
+            {"resolved": "sender"},
+            "%3Aloxthelion.com",
+        ],
+    },
 }
 
 method = "GET"
 
 path = [
-    "https://loxthelion.com/_matrix/client/v3/directory/room/%23rmass_dm_",
-    {"resolved": "sender"},
-    "%3Aloxthelion.com",
+    "https://loxthelion.com/_matrix/client/v3/directory/room/",
+    {"resolved": "matrixdm"},
 ]
 
 headers = {

plugins/rmass/actions/synapsegetspaceid.py

@@ -7,16 +7,23 @@ kind = "action"
 showstatus = True
 
 resolve = {
-    "sender": ["messages", 0, "senderId"],
+    "get": {
         "locationcode": ["profile", "searchCity"],
+    },
+    "construct": {
+        "matrixspace": [
+            "%23rmass_space_",
+            {"resolved": "locationcode"},
+            "%3Aloxthelion.com",
+        ],
+    },
 }
 
 method = "GET"
 
 path = [
-    "https://loxthelion.com/_matrix/client/v3/directory/room/%23rmass_space_",
-    {"resolved": "locationcode"},
-    "%3Aloxthelion.com",
+    "https://loxthelion.com/_matrix/client/v3/directory/room/",
+    {"resolved": "matrixspace"},
 ]
 
 headers = {

plugins/rmass/actions/synapsepushmessages.py

@@ -13,12 +13,27 @@ recursive = {
 }
 
 resolve = {
+    "get": {
         "sender": ["messageitem", "senderId"],
         "message_id": ["messageitem", "id"],
         "message_body": ["messageitem", "text"],
         "room_id": ["dmroom_id"],
         "timestamp": ["messageitem", "createdAt"],
+    },
+    "construct": {
+        "matrixuser": [
+            "@rmass_",
+            {"resolved": "sender"},
+            ":loxthelion.com",
+        ],
+    },
+    "transform": {
+        "matrixuser": {
+            "@rmass_238302:loxthelion.com": "@lyncoln:loxthelion.com",
+        },
+    },
 }
+
 keys = [
     {
         "keytitle": "msgtype",
@@ -30,6 +45,17 @@ keys = [
             "resolved": "message_body",
         },
     },
+    {
+        "keytitle": "format",
+        "keyvalue": "org.matrix.custom.html",
+    },
+    {
+        "keytitle": "formatted_body",
+        "keyvalue": {
+            "resolved": "message_body",
+        },
+    },
+        
 ]
 
 method = "PUT"
@@ -39,9 +65,9 @@ path = [
     {"resolved": "room_id"},
     "/send/m.room.message/",
     {"resolved": "message_id"},
-    "?user_id=@rmass_",
-    {"resolved": "sender"},
-    ":loxthelion.com&ts=",
+    "?user_id=",
+    {"resolved": "matrixuser"},
+    "&ts=",
     {"resolved": "timestamp"},
     "000"
 ]

plugins/rmass/actions/synapseregister.py

@@ -7,9 +7,11 @@ kind = "action"
 showstatus = True
 
 resolve = {
+    "get": {
         "sender": ["messages", 0, "senderId"],
         "username": ["profile", "username"],
     }
+}
 keys = [
     {
         "keytitle": "type",

savedata/tokens.json

@@ -0,0 +1 @@
+{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIwNDA4ODgsIm5iZiI6MTc5MjA0MDcwOCwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjA0MDc2OH0.8twTKQb2OG-OfT_C2eAwD2OpV__X7S-MWnpVXdLeLvBzfZcW6ZJLesvSqgYXeO56yn-_UblIUEwfy_B8EuDTSw", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ2MzI3NjgsIm5iZiI6MTc5MjA0MDcwOCwianRpIjoiUXRjRXE2TWtGdWhHNjdiTHdLak1kdzJXazIzMlFtVkp4K2J3aGs2RTlCZz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjA0MDc2OCwic3ViIjoiMjM4MzAyIn0.zmQ9S08NHgr2q0g3VloTgY3xBjATxXk2mdg6MbeHjuQ47OZ24E8bBNyRaqDJYJ0OnCkF5CvepJ5ISlnvkqTPRA"}

tokens.json

@@ -1 +1 @@
-{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIwMzI4ODYsIm5iZiI6MTc5MjAzMjcwNiwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjAzMjc2Nn0.ChWvtapeudX4p0aEXxxMB0FWjDbLSCqgzevyi8UlhXj34l397o70_Owtns60TGh4JbC2l4EBInTggujF3bYREg", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ2MjQ3NjYsIm5iZiI6MTc5MjAzMjcwNiwianRpIjoibzNZYXMrNU5YNkRSc3pSa05kOTBQa3BMMTJ5VXkwWWx6ZTVNUUZMbFovcz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjAzMjc2Niwic3ViIjoiMjM4MzAyIn0.tXWt8Jgc9jW006ZKSPMsueWNUNWaaenlkDc9-TphAkLDtWWRY5_2zz8Bdt8qgl_s0NJ_WDXnv6WwU5on054BZA"}
+{"access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTIwODQ2MDksIm5iZiI6MTc5MjA4NDQyOSwic3ViIjoiMjM4MzAyIiwidXNlcm5hbWUiOiJYeHhvdGlxIiwidXNlclR5cGUiOjEsInN0YWdlTmFtZSI6Ilh4eG90aXEiLCJhcHByb3ZlZCI6MSwibG9jYXRpb25JZCI6NDcyLCJzZWFyY2hDaXR5IjoiYXRsYW50YSIsImNvdW50cnlTaG9ydCI6IlVTIiwic2Vzc2lvbkNvdW50cnlDb250aW5lbnQiOiJOQSIsImlzRnJvemVuIjowLCJsb2NhdGlvbkxhYmVsIjoiQXRsYW50YSwgR0EiLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjA4NDQ4OX0.CcXQrFvFl5LraO3VWoe3CZ4u-jAHVuMt6Fag2_v5QJ79ekRsPMnOFSMjLycaZoc0hTZRiJnpUIqBWKmTsg2juA", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJleHAiOjE3OTQ2NzY0ODksIm5iZiI6MTc5MjA4NDQyOSwianRpIjoiQjIrSmxQWVdvYjYvOVBYTjZ3VnFrZzhmZHFrY05nQVZjbHF5YVluclJUdz0iLCJpc3MiOiJodHRwczovL3JlbnRtYXNzZXVyLmNvbSIsImlhdCI6MTc5MjA4NDQ4OSwic3ViIjoiMjM4MzAyIn0.RSOQP-lQv7N7Ut_YOkwF58-k-kGoFYCsGqYISJiUxajJ2YuDWz6vMQoWCN82NYUPJvfFDnGgiiugAnrhWS-OoQ"}