summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-09 17:22:29 +0000
committerErik Johnston <erik@matrix.org>2015-03-09 17:22:29 +0000
commit9fccb0df08fff6d70e86215053cde17f1553db4c (patch)
treeb7e25c222b3e0182d733321108bb1357140f21f7 /synapse/handlers/room.py
parentD'oh: underscore, not hyphen (diff)
parentFix tests (diff)
downloadsynapse-9fccb0df08fff6d70e86215053cde17f1553db4c.tar.xz
Merge pull request #104 from matrix-org/get_joined_rooms_for_user
Get joined rooms for user
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index 80f7ee3f12..823affc380 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -507,7 +507,7 @@ class RoomMemberHandler(BaseHandler): defer.returnValue((is_remote_invite_join, room_host)) @defer.inlineCallbacks - def get_rooms_for_user(self, user, membership_list=[Membership.JOIN]): + def get_joined_rooms_for_user(self, user): """Returns a list of roomids that the user has any of the given membership states in.""" @@ -517,8 +517,8 @@ class RoomMemberHandler(BaseHandler): if app_service: rooms = yield self.store.get_app_service_rooms(app_service) else: - rooms = yield self.store.get_rooms_for_user_where_membership_is( - user_id=user.to_string(), membership_list=membership_list + rooms = yield self.store.get_rooms_for_user( + user.to_string(), ) # For some reason the list of events contains duplicates