From fcaf27338e04af1e30f7bbf86e07f3d007246ed9 Mon Sep 17 00:00:00 2001
From: Lyncoln <arcticfoxx_dlf@hotmail.com>
Date: Mon, 26 Oct 2026 10:00:03 -0400
Subject: [PATCH] Refined synapse message/attachment push process

---
 .../rmass/actions/rmassattachmenttosynapse.py |  9 -------
 .../rmass/actions/synapsepushattachments.py   |  6 -----
 plugins/rmass/actions/synapsepushmessages.py  |  6 -----
 .../rmass/operations/synapsemessagepush.py    | 27 +++----------------
 .../synapsepushmessageattachments.py          | 17 ++++++++++++
 .../operations/synapsepushmessageitems.py     | 16 +++++++++++
 6 files changed, 36 insertions(+), 45 deletions(-)
 create mode 100644 plugins/rmass/operations/synapsepushmessageattachments.py
 create mode 100644 plugins/rmass/operations/synapsepushmessageitems.py

diff --git a/plugins/rmass/actions/rmassattachmenttosynapse.py b/plugins/rmass/actions/rmassattachmenttosynapse.py
index 5d41964..48586c4 100644
--- a/plugins/rmass/actions/rmassattachmenttosynapse.py
+++ b/plugins/rmass/actions/rmassattachmenttosynapse.py
@@ -6,15 +6,6 @@ alias = "uploadattachment"
 
 showstatus = True
 
-#resolve = {
-#    "get": {
-        #"sender": ["messageheaders", "userCard", "id"],
-        #"avatar": ["uploadimage"],
-        #"username": ["messageheaders", "userCard", "username"],
-        #"avatar_hash": ["useravatar_hash"],
-#    },
-#}
-
 isrequest = True
 
 method = "POST"
diff --git a/plugins/rmass/actions/synapsepushattachments.py b/plugins/rmass/actions/synapsepushattachments.py
index 6516fc9..5b7342e 100644
--- a/plugins/rmass/actions/synapsepushattachments.py
+++ b/plugins/rmass/actions/synapsepushattachments.py
@@ -6,12 +6,6 @@ kind = "action"
 
 showstatus = True
 
-#recursive = {
-#    "source": "getmessage_select",
-#    "reverse": True,
-#    "label": "messageitem",
-#}
-
 resolve = {
     "get": {
         "sender": ["messageitem", "senderId"],
diff --git a/plugins/rmass/actions/synapsepushmessages.py b/plugins/rmass/actions/synapsepushmessages.py
index 2eae59b..810091b 100644
--- a/plugins/rmass/actions/synapsepushmessages.py
+++ b/plugins/rmass/actions/synapsepushmessages.py
@@ -6,12 +6,6 @@ kind = "action"
 
 showstatus = True
 
-#recursive = {
-#    "source": "getmessage_select",
-#    "reverse": True,
-#    "label": "messageitem",
-#}
-
 resolve = {
     "get": {
         "sender": ["messageitem", "senderId"],
diff --git a/plugins/rmass/operations/synapsemessagepush.py b/plugins/rmass/operations/synapsemessagepush.py
index d923512..e460e27 100644
--- a/plugins/rmass/operations/synapsemessagepush.py
+++ b/plugins/rmass/operations/synapsemessagepush.py
@@ -1,5 +1,5 @@
 from plugins.rmass.actions import pullmessagelist, refresh_tokens, getmessage, synapseregister, synapseassignusername, getrmassuseravatar, rmassavatartosynapse, synapseassignavatar, synapsecreatespace, synapsegetspaceid, synapsecreatedmroom, synapseassigndmavatar, synapsegetroomid, synapseassignspace#, synapsepushmessages
-from plugins.rmass.operations import getrmassconversations, synapsepushmessages
+from plugins.rmass.operations import getrmassconversations, synapsepushmessageitems
 
 
 name = "Get Message List"
@@ -7,28 +7,7 @@ name = "Get Message List"
 kind = "operation"
 
 actions = [
-    refresh_tokens,
+    #refresh_tokens,
     pullmessagelist,
     getrmassconversations,
-    #synapsepushmessages,
-]
-
-#recursiveset = {
-#    "source": "pullmessages_select",
-#    "outputlabel": "messageheaders",
-#    "actions": [
-#        synapseregister, 
-#        synapseassignusername, 
-#        getrmassuseravatar, 
-#        rmassavatartosynapse, 
-#        synapseassignavatar, 
-#        getmessage,
-        #synapsecreatespace, 
-        #synapsegetspaceid, 
-#        synapsecreatedmroom, 
-#        synapsegetroomid,
-#        synapseassigndmavatar,
-        #synapseassignspace, 
-#        synapsepushmessages,
-#    ],
-#}        
+]
\ No newline at end of file
diff --git a/plugins/rmass/operations/synapsepushmessageattachments.py b/plugins/rmass/operations/synapsepushmessageattachments.py
new file mode 100644
index 0000000..20b4fd2
--- /dev/null
+++ b/plugins/rmass/operations/synapsepushmessageattachments.py
@@ -0,0 +1,17 @@
+from plugins.rmass.actions import synapsepushmessages, synapsepushattachments, getrmassattachments, rmassattachmenttosynapse
+
+kind = "recursiveset"
+
+name = "Synapse Attachment Push Recursive Set"
+
+recursiveset = {
+    "source": "attachment_list",
+    "reverse": False,
+    "retain": False,
+    "outputlabel": "attachment_item",
+    "actions": [
+        getrmassattachments,
+        rmassattachmenttosynapse,
+        synapsepushattachments,
+    ],
+} 
\ No newline at end of file
diff --git a/plugins/rmass/operations/synapsepushmessageitems.py b/plugins/rmass/operations/synapsepushmessageitems.py
new file mode 100644
index 0000000..7d2feee
--- /dev/null
+++ b/plugins/rmass/operations/synapsepushmessageitems.py
@@ -0,0 +1,16 @@
+from plugins.rmass.actions import synapsepushmessages 
+from plugins.rmass.operations import synapsepushmessageattachments
+
+kind = "recursiveset"
+
+name = "Synapse Message Push Recursive Set"
+
+recursiveset = {
+    "source": "getmessage_select",
+    "reverse": True,
+    "outputlabel": "messageitem",
+    "actions": [ 
+        synapsepushmessages,
+        synapsepushmessageattachments,
+    ],
+} 
\ No newline at end of file