From 00094e272f0bfdaa69ecfcc7bcc7c3299f2bd1f0 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 13 Mar 2023 13:42:43 -0700
Subject: [PATCH] ircd::m::vm::inject: Add membership prior to auth_events
 generation.

Fixes m.room.join_rules added to membership=leave auth_events.

(regression matrix-org/synapse#13088 matrix-org/synapse@d4b1c0d800)
---
 matrix/vm_inject.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/matrix/vm_inject.cc b/matrix/vm_inject.cc
index 6e7c2a3fe..7c4106ef9 100644
--- a/matrix/vm_inject.cc
+++ b/matrix/vm_inject.cc
@@ -267,6 +267,17 @@ ircd::m::vm::inject(eval &eval,
 		}
 	};
 
+	const json::iov::defaults membership_
+	{
+		event, event.at("type") == "m.room.member",
+		{
+			"membership", [&contents]()
+			{
+				return contents.at("membership");
+			}
+		}
+	};
+
 	const bool add_auth_events
 	{
 		!is_room_create