From 2c95d1f08bd4d6242dfd601c7f3e7214b7129087 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 13 Apr 2017 16:01:10 +0100 Subject: [PATCH 1/3] m.read_marker -> m.read_up_to Also: - change the REST endpoint to have a "S" on the end (so it's now /read_markers) - change the content of the m.read_up_to event to have the key "event_id" instead of "marker". --- synapse/handlers/read_marker.py | 8 ++++---- synapse/rest/client/v2_alpha/read_marker.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/synapse/handlers/read_marker.py b/synapse/handlers/read_marker.py index 3f46a16b9081..750328bd7992 100644 --- a/synapse/handlers/read_marker.py +++ b/synapse/handlers/read_marker.py @@ -43,7 +43,7 @@ def received_client_read_marker(self, room_id, user_id, event_id): with (yield self.read_marker_linearizer.queue((room_id, user_id))): account_data = yield self.store.get_account_data_for_room(user_id, room_id) - existing_read_marker = account_data.get("m.read_marker", None) + existing_read_marker = account_data.get("m.read_up_to", None) should_update = True @@ -51,14 +51,14 @@ def received_client_read_marker(self, room_id, user_id, event_id): # Only update if the new marker is ahead in the stream should_update = yield self.store.is_event_after( event_id, - existing_read_marker['marker'] + existing_read_marker['event_id'] ) if should_update: content = { - "marker": event_id + "event_id": event_id } max_id = yield self.store.add_account_data_to_room( - user_id, room_id, "m.read_marker", content + user_id, room_id, "m.read_up_to", content ) self.notifier.on_new_event("account_data_key", max_id, users=[user_id]) diff --git a/synapse/rest/client/v2_alpha/read_marker.py b/synapse/rest/client/v2_alpha/read_marker.py index 95e8e3997437..c6c3a427a46b 100644 --- a/synapse/rest/client/v2_alpha/read_marker.py +++ b/synapse/rest/client/v2_alpha/read_marker.py @@ -25,7 +25,7 @@ class ReadMarkerRestServlet(RestServlet): - PATTERNS = client_v2_patterns("/rooms/(?P[^/]*)/read_marker$") + PATTERNS = client_v2_patterns("/rooms/(?P[^/]*)/read_markers$") def __init__(self, hs): super(ReadMarkerRestServlet, self).__init__() @@ -51,7 +51,7 @@ def on_POST(self, request, room_id): event_id=read_event_id ) - read_marker_event_id = body.get("m.read_marker", None) + read_marker_event_id = body.get("m.read_up_to", None) if read_marker_event_id: yield self.read_marker_handler.received_client_read_marker( room_id, From 297657f83cb77afcb71c21eab0944b519ba23476 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 18 Apr 2017 10:38:21 +0100 Subject: [PATCH 2/3] m.read_up_to -> m.fully_read --- synapse/handlers/read_marker.py | 4 ++-- synapse/rest/client/v2_alpha/read_marker.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/handlers/read_marker.py b/synapse/handlers/read_marker.py index 750328bd7992..b5b0303d54e0 100644 --- a/synapse/handlers/read_marker.py +++ b/synapse/handlers/read_marker.py @@ -43,7 +43,7 @@ def received_client_read_marker(self, room_id, user_id, event_id): with (yield self.read_marker_linearizer.queue((room_id, user_id))): account_data = yield self.store.get_account_data_for_room(user_id, room_id) - existing_read_marker = account_data.get("m.read_up_to", None) + existing_read_marker = account_data.get("m.fully_read", None) should_update = True @@ -59,6 +59,6 @@ def received_client_read_marker(self, room_id, user_id, event_id): "event_id": event_id } max_id = yield self.store.add_account_data_to_room( - user_id, room_id, "m.read_up_to", content + user_id, room_id, "m.fully_read", content ) self.notifier.on_new_event("account_data_key", max_id, users=[user_id]) diff --git a/synapse/rest/client/v2_alpha/read_marker.py b/synapse/rest/client/v2_alpha/read_marker.py index c6c3a427a46b..2f8784fe06ec 100644 --- a/synapse/rest/client/v2_alpha/read_marker.py +++ b/synapse/rest/client/v2_alpha/read_marker.py @@ -51,7 +51,7 @@ def on_POST(self, request, room_id): event_id=read_event_id ) - read_marker_event_id = body.get("m.read_up_to", None) + read_marker_event_id = body.get("m.fully_read", None) if read_marker_event_id: yield self.read_marker_handler.received_client_read_marker( room_id, From 4b8204214897181ef1d83f6a8e9854888a617c3d Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 18 Apr 2017 14:53:38 +0100 Subject: [PATCH 3/3] Update account data PUT --- synapse/rest/client/v2_alpha/account_data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/rest/client/v2_alpha/account_data.py b/synapse/rest/client/v2_alpha/account_data.py index 1f9f42e661b7..0e0a187efdfe 100644 --- a/synapse/rest/client/v2_alpha/account_data.py +++ b/synapse/rest/client/v2_alpha/account_data.py @@ -82,11 +82,11 @@ def on_PUT(self, request, user_id, room_id, account_data_type): body = parse_json_object_from_request(request) - if account_data_type == "m.read_marker": + if account_data_type == "m.fully_read": raise SynapseError( 405, - "Cannot set m.read_marker through this API." - " Use /rooms/!roomId:server.name/read_marker" + "Cannot set m.fully_read through this API." + " Use /rooms/!roomId:server.name/read_markers" ) max_id = yield self.store.add_account_data_to_room(