OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Neaten things up a bit

pull/12/head
Erik Johnston 2014-11-06 17:26:13 +00:00
parent 46de65cab9
commit 8421cabb9d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/api/auth.py
View File

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