From 7679644e078ca4d4874183ed2fa3b75872986c5a Mon Sep 17 00:00:00 2001
From: Lyncoln <arcticfoxx_dlf@hotmail.com>
Date: Mon, 26 Oct 2026 09:40:32 -0400
Subject: [PATCH] Gated database message mapping behind RMASS message sent
 status

---
 plugins/rmass/actions/getrmassconversation.py | 27 +++++++++++++------
 .../rmass/actions/synapsegetlastmessage.py    | 21 ++++++++++++++-
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/plugins/rmass/actions/getrmassconversation.py b/plugins/rmass/actions/getrmassconversation.py
index 8777ab0..2c1d6b9 100644
--- a/plugins/rmass/actions/getrmassconversation.py
+++ b/plugins/rmass/actions/getrmassconversation.py
@@ -15,6 +15,10 @@ resolve = {
     "get": {
         "event_id": ["outmessageitem", "event_id"],
         "path": ["lastmessage", 0, "content", "com.loxthelion.rmass_message_id"],
+        #"matrix_sender": ["outmessageitem", "sender"],
+        #"msg_type": ["outmessageitem", "type"],
+        #"echo_tag": ["outmessageitem", "content", "com.loxthelion.rmass_message_id"],
+        "rmass_sent_status": ["rmass_sent_status"],
     },
 }
 
@@ -67,11 +71,18 @@ saverow = {
     ],
 }
 
-#filters = [
-#    {
-#        "filterkey": "rmass_sent_status",
-#        "operator": "==",
-#        "filtervalue": "fail",
-#        "print": "Failed to send message to RMASS. Continuing...",
-#    },
-#]
\ No newline at end of file
+
+filters = [
+    {
+        "filterkey": "rmass_sent_status",
+        "operator": "==",
+        "filtervalue": "fail",
+        "print": f"Failed to send message to RMASS. Bypassing save during {name}...",
+    },
+    {
+        "filterkey": "rmass_sent_status",
+        "operator": "==",
+        "filtervalue": "error",
+        "print": f"Failed to send message to RMASS. Bypassing save during {name}...",
+    },
+]
diff --git a/plugins/rmass/actions/synapsegetlastmessage.py b/plugins/rmass/actions/synapsegetlastmessage.py
index 7745d8b..024b310 100644
--- a/plugins/rmass/actions/synapsegetlastmessage.py
+++ b/plugins/rmass/actions/synapsegetlastmessage.py
@@ -11,10 +11,14 @@ method = "GET"
 resolve = {
     "get": {
         #"sender": ["room_name"],
-        "event_id": ["outmessageitem", "event_id"],
+        #"event_id": ["outmessageitem", "event_id"],
         #"message_body": ["outmessageitem", "content", "body"],
         "room_id": ["outmessageitem", "room_id"],
         #"timestamp": ["outmessageitem", "origin_server_ts"],
+        #"matrix_sender": ["outmessageitem", "sender"],
+        #"msg_type": ["outmessageitem", "type"],
+        #"echo_tag": ["outmessageitem", "content", "com.loxthelion.rmass_message_id"],
+        "rmass_sent_status": ["rmass_sent_status"],
     },
 }
 
@@ -35,3 +39,18 @@ headers = {
 outputs = {
     "lastmessage": "chunk"
 }
+
+filters = [
+    {
+        "filterkey": "rmass_sent_status",
+        "operator": "==",
+        "filtervalue": "fail",
+        "print": f"Failed to send message to RMASS. Bypassing save during {name}...",
+    },
+    {
+        "filterkey": "rmass_sent_status",
+        "operator": "==",
+        "filtervalue": "error",
+        "print": f"Failed to send message to RMASS. Bypassing save during {name}...",
+    },
+]