summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-10-31 13:15:14 -0600
committerTravis Ralston <travpc@gmail.com>2018-10-31 13:15:14 -0600
commitd1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch)
treec832189c0f04fa02354feb419d72d6ad64b0e77f /synapse/rest/client/v1/room.py
parentpep8 (diff)
parentMerge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff)
downloadsynapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 663934efd0..fcfe7857f6 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -33,6 +33,7 @@ from synapse.http.servlet import (
     parse_json_object_from_request,
     parse_string,
 )
+from synapse.storage.state import StateFilter
 from synapse.streams.config import PaginationConfig
 from synapse.types import RoomAlias, RoomID, StreamToken, ThirdPartyInstanceID, UserID
 
@@ -409,7 +410,7 @@ class RoomMemberListRestServlet(ClientV1RestServlet):
             room_id=room_id,
             user_id=requester.user.to_string(),
             at_token=at_token,
-            types=[(EventTypes.Member, None)],
+            state_filter=StateFilter.from_types([(EventTypes.Member, None)]),
         )
 
         chunk = []