diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-26 16:22:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-26 16:22:45 +0100 |
| commit | 03e634dad4cd1014f609ece9574df7a24f1ec254 (patch) | |
| tree | a9f4a53a03bb0205e616ce7cf741fdbd15d4fcf5 /synapse/rest/client/v1/room.py | |
| parent | pep8 (diff) | |
| parent | Port register_new_matrix_user to Python 3 and add tests (#4085) (diff) | |
| download | synapse-03e634dad4cd1014f609ece9574df7a24f1ec254.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 3 |
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 = [] |