From 65b516e4c0ee20d2338b1a11e61231ef955f3e83 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sun, 20 May 2018 20:26:12 -0700
Subject: [PATCH] ircd::m: Use proper m::membership(event) test and deoptimize
 accordingly.

---
 ircd/m/room.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ircd/m/room.cc b/ircd/m/room.cc
index 3d1ba15f0..26fed2b2b 100644
--- a/ircd/m/room.cc
+++ b/ircd/m/room.cc
@@ -1339,6 +1339,7 @@ const
 			"event_id",
 			"membership",
 			"state_key",
+			"content",    // Required because synapse events randomly have no event.membership
 		}
 	};
 
@@ -1420,7 +1421,7 @@ const
 	return test(event::closure_bool{[&membership, &closure]
 	(const event &event)
 	{
-		if(at<"membership"_>(event) == membership)
+		if(m::membership(event) == membership)
 			if(closure(event))
 				return true;