diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-19 13:50:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-19 13:50:40 +0100 |
| commit | 09d23b620951ae07c7aa7ff99fe96a0b173d1397 (patch) | |
| tree | 3a8cc39f417fcaad2c88da5782536d99e495c124 /synapse/handlers/room.py | |
| parent | Remove an access token log line (diff) | |
| parent | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users (diff) | |
| download | synapse-09d23b620951ae07c7aa7ff99fe96a0b173d1397.tar.xz | |
Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms
Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 7511d294f3..82c16013a3 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -557,15 +557,9 @@ class RoomMemberHandler(BaseHandler): """Returns a list of roomids that the user has any of the given membership states in.""" - app_service = yield self.store.get_app_service_by_user_id( - user.to_string() + rooms = yield self.store.get_rooms_for_user( + user.to_string(), ) - if app_service: - rooms = yield self.store.get_app_service_rooms(app_service) - else: - rooms = yield self.store.get_rooms_for_user( - user.to_string(), - ) # For some reason the list of events contains duplicates # TODO(paul): work out why because I really don't think it should |