Neaten things up a bit

1 files changed, 2 insertions, 5 deletions

diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 462e97bd90..bb25c4ec55 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -58,14 +58,13 @@ class Auth(object):
                     # TODO (erikj): Auth for outliers is done differently.
                     return True
 
-                is_state = hasattr(event, "state_key")
-
                 if event.type == RoomCreateEvent.TYPE:
                     # FIXME
                     return True
 
+                self._can_send_event(event)
+
                 if event.type == RoomMemberEvent.TYPE:
-                    self._can_send_event(event)
                     allowed = self.is_membership_change_allowed(event)
                     if allowed:
                         logger.debug("Allowing! %s", event)
@@ -73,8 +72,6 @@ class Auth(object):
                         logger.debug("Denying! %s", event)
                     return allowed
 
-                self._can_send_event(event)
-
                 if event.type == RoomPowerLevelsEvent.TYPE:
                     self._check_power_levels(event)