m.read_marker -> m.fully_read (#2128)

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".
This commit is contained in:
Luke Barnard 2017-04-18 17:46:15 +01:00 committed by Richard van der Hoff
parent c02b6a37d6
commit 3fb8784c92
3 changed files with 9 additions and 9 deletions

View file

@ -43,7 +43,7 @@ class ReadMarkerHandler(BaseHandler):
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.fully_read", None)
should_update = True
@ -51,14 +51,14 @@ class ReadMarkerHandler(BaseHandler):
# 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.fully_read", content
)
self.notifier.on_new_event("account_data_key", max_id, users=[user_id])