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/room.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/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 6c425828c1..8df8fcbbad 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -475,12 +475,9 @@ class RoomEventSource(object): user.to_string() ) if app_service: - events, end_key = yield self.store.get_appservice_room_stream( - service=app_service, - from_key=from_key, - to_key=to_key, - limit=limit, - ) + # We no longer support AS users using /sync directly. + # See https://github.com/matrix-org/matrix-doc/issues/1144 + raise NotImplementedError() else: room_events = yield self.store.get_membership_changes_for_user( user.to_string(), from_key, to_key |