From 1bf614b0f57a023cbc467f1e5bf03d1eae87b755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Tue, 15 Sep 2020 17:02:20 +0200
Subject: [PATCH] fix: remove transaction_id from pdus over federation

---
 src/database/sending.rs | 6 ++++++
 src/pdu.rs              | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/database/sending.rs b/src/database/sending.rs
index 187fd575..77998e79 100644
--- a/src/database/sending.rs
+++ b/src/database/sending.rs
@@ -36,6 +36,12 @@ impl Sending {
                         let pdu_id = parts.next().ok_or_else(|| Error::bad_database("Invalid serverpduid in db."))?;
                         let mut pdu_json = rooms.get_pdu_json_from_id(&pdu_id.into())?.ok_or_else(|| Error::bad_database("Event in serverpduids not found in db."))?;
 
+                        if let Some(unsigned) = pdu_json
+                            .as_object_mut()
+                            .expect("json is object")
+                            .get_mut("unsigned") {
+                                unsigned.as_object_mut().expect("unsigned is object").remove("transaction_id");
+                        }
                         pdu_json
                             .as_object_mut()
                             .expect("json is object")
diff --git a/src/pdu.rs b/src/pdu.rs
index 6d78092f..957d9e0a 100644
--- a/src/pdu.rs
+++ b/src/pdu.rs
@@ -201,6 +201,9 @@ impl PduEvent {
     }
 
     pub fn to_outgoing_federation_event(&self) -> Raw<PduStub> {
+        let mut unsigned = self.unsigned.clone();
+        unsigned.remove("transaction_id");
+
         let mut json = json!({
             "room_id": self.room_id,
             "sender": self.sender,
@@ -210,7 +213,7 @@ impl PduEvent {
             "prev_events": self.prev_events,
             "depth": self.depth,
             "auth_events": self.auth_events,
-            "unsigned": self.unsigned,
+            "unsigned": unsigned,
             "hashes": self.hashes,
             "signatures": self.signatures,
         });