summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room_member.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 9f8975e1f2..9b99f0f9d7 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -299,9 +299,10 @@ class RoomMemberHandler(object):
             if is_blocked:
                 raise SynapseError(403, "This room has been blocked on this server")
         else:
-            if self._is_server_notice_room(room_id):
-                # we don't allow people to reject invites to, or leave, the
-                # server notice room.
+            # we don't allow people to reject invites to, or leave, the
+            # server notice room.
+            is_blocked = yield self._is_server_notice_room(room_id)
+            if is_blocked:
                 raise SynapseError(
                     http_client.FORBIDDEN,
                     "You cannot leave this room",