summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-05 15:42:57 +0000
committerErik Johnston <erik@matrix.org>2018-03-05 15:44:46 +0000
commitd4ffe61d4fb71953bff0f94ff5d1603afe7d46f7 (patch)
tree47b4f37f1ace02351f4bc6dd35b3493f5d9f41b3 /synapse/handlers/room.py
parentMerge pull request #2934 from matrix-org/erikj/cache_fix (diff)
downloadsynapse-d4ffe61d4fb71953bff0f94ff5d1603afe7d46f7.tar.xz
Remove ability for AS users to call /events and /sync
This functionality has been deprecated for a while as well as being
broken for a while. Instead of fixing it lets just remove it entirely.

See: https://github.com/matrix-org/matrix-doc/issues/1144
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py9
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