From 4bb83a1972900543e899aeba3bfad515618ffd34 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 12 Aug 2025 03:50:10 +0000
Subject: [PATCH] Fix version 12 outgoing federation format.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/service/sending/sender.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs
index 917de252..dc23ef7a 100644
--- a/src/service/sending/sender.rs
+++ b/src/service/sending/sender.rs
@@ -39,7 +39,7 @@ use ruma::{
 };
 use serde_json::value::{RawValue as RawJsonValue, to_raw_value};
 use tuwunel_core::{
-	Error, Event, Result, debug, err, error, implement,
+	Error, Event, Result, debug, err, error, implement, is_equal_to,
 	matrix::room_version,
 	result::LogErr,
 	trace,
@@ -989,6 +989,12 @@ async fn strip_outgoing_federation_event(&self, pdu_json: &mut CanonicalJsonObje
 		.event_format
 		.require_room_create_room_id
 	{
-		pdu_json.remove("room_id");
+		if pdu_json
+			.get("type")
+			.and_then(CanonicalJsonValue::as_str)
+			.is_some_and(is_equal_to!("m.room.create"))
+		{
+			pdu_json.remove("room_id");
+		}
 	}
 }