diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-06 11:10:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 11:10:09 +0000 |
| commit | 7aed50a03848859fca73460a3c1b3041016e2188 (patch) | |
| tree | e5644bfbf9dd9a4edac3c61dd68479e308eb28cf /synapse/handlers/sync.py | |
| parent | Merge pull request #2947 from matrix-org/erikj/split_directory_store (diff) | |
| parent | Remove ability for AS users to call /events and /sync (diff) | |
| download | synapse-7aed50a03848859fca73460a3c1b3041016e2188.tar.xz | |
Merge pull request #2948 from matrix-org/erikj/kill_as_sync
Remove ability for AS users to call /events and /sync
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index b12988f3c9..56b86356f2 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -998,8 +998,9 @@ class SyncHandler(object): app_service = self.store.get_app_service_by_user_id(user_id) if app_service: - rooms = yield self.store.get_app_service_rooms(app_service) - joined_room_ids = set(r.room_id for r in rooms) + # We no longer support AS users using /sync directly. + # See https://github.com/matrix-org/matrix-doc/issues/1144 + raise NotImplementedError() else: joined_room_ids = yield self.store.get_rooms_for_user(user_id) @@ -1030,8 +1031,9 @@ class SyncHandler(object): app_service = self.store.get_app_service_by_user_id(user_id) if app_service: - rooms = yield self.store.get_app_service_rooms(app_service) - joined_room_ids = set(r.room_id for r in rooms) + # We no longer support AS users using /sync directly. + # See https://github.com/matrix-org/matrix-doc/issues/1144 + raise NotImplementedError() else: joined_room_ids = yield self.store.get_rooms_for_user(user_id) |