mirror of
https://github.com/element-hq/synapse
synced 2024-09-04 19:30:06 +00:00
Initial commit of RM server-side impl
(See https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit#heading=h.lndohpg8at5u)
This commit is contained in:
parent
7c551ec445
commit
e263c26690
2 changed files with 153 additions and 0 deletions
82
synapse/handlers/read_marker.py
Normal file
82
synapse/handlers/read_marker.py
Normal file
|
@ -0,0 +1,82 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright 2015, 2016 OpenMarket Ltd
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
from ._base import BaseHandler
|
||||||
|
|
||||||
|
from twisted.internet import defer
|
||||||
|
|
||||||
|
from synapse.util.logcontext import PreserveLoggingContext
|
||||||
|
from synapse.types import get_domain_from_id
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class ReadMarkerHandler(BaseHandler):
|
||||||
|
def __init__(self, hs):
|
||||||
|
super(ReadMarkerHandler, self).__init__(hs)
|
||||||
|
|
||||||
|
self.server_name = hs.config.server_name
|
||||||
|
self.store = hs.get_datastore()
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def received_client_read_marker(self, room_id, user_id, event_id):
|
||||||
|
"""NEEDS DOC
|
||||||
|
"""
|
||||||
|
|
||||||
|
room_id = read_marker["room_id"]
|
||||||
|
user_id = read_marker["user_id"]
|
||||||
|
event_id = read_marker["event_id"]
|
||||||
|
|
||||||
|
# Get ordering for existing read marker
|
||||||
|
account_data = yield self.store.get_account_data_for_room(user_id, room_id)
|
||||||
|
existing_read_marker = account_data["m.read_marker"]
|
||||||
|
|
||||||
|
if existing_read_marker:
|
||||||
|
# Get ordering for new read marker
|
||||||
|
res = self.store._simple_select_one_txn(
|
||||||
|
txn,
|
||||||
|
table="events",
|
||||||
|
retcols=["topological_ordering", "stream_ordering"],
|
||||||
|
keyvalues={"event_id": event_id},
|
||||||
|
allow_none=True
|
||||||
|
)
|
||||||
|
new_to = int(res["topological_ordering"]) if res else None
|
||||||
|
new_so = int(res["stream_ordering"]) if res else None
|
||||||
|
|
||||||
|
res = self.store._simple_select_one_txn(
|
||||||
|
txn,
|
||||||
|
table="events",
|
||||||
|
retcols=["topological_ordering", "stream_ordering"],
|
||||||
|
keyvalues={"event_id": existing_read_marker.content.marker},
|
||||||
|
allow_none=True
|
||||||
|
)
|
||||||
|
existing_to = int(res["topological_ordering"]) if res else None
|
||||||
|
existing_so = int(res["stream_ordering"]) if res else None
|
||||||
|
|
||||||
|
if new_to > existing_to:
|
||||||
|
return False
|
||||||
|
elif new_to == existing_to and new_so >= existing_so:
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Update account data
|
||||||
|
content = {
|
||||||
|
"marker": event_id
|
||||||
|
}
|
||||||
|
yield self.store.add_account_data_to_room(
|
||||||
|
user_id, room_id, "m.read_marker", content
|
||||||
|
)
|
71
synapse/rest/client/v2_alpha/read_marker.py
Normal file
71
synapse/rest/client/v2_alpha/read_marker.py
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright 2017 Vector Creations Ltd
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
from twisted.internet import defer
|
||||||
|
|
||||||
|
from synapse.api.errors import SynapseError
|
||||||
|
from synapse.http.servlet import RestServlet, parse_json_object_from_request
|
||||||
|
from ._base import client_v2_patterns
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class ReceiptRestServlet(RestServlet):
|
||||||
|
PATTERNS = client_v2_patterns(
|
||||||
|
"/rooms/(?P<room_id>[^/]*)"
|
||||||
|
"/read_marker$"
|
||||||
|
)
|
||||||
|
|
||||||
|
def __init__(self, hs):
|
||||||
|
super(ReceiptRestServlet, self).__init__()
|
||||||
|
self.hs = hs
|
||||||
|
self.auth = hs.get_auth()
|
||||||
|
self.receipts_handler = hs.get_receipts_handler()
|
||||||
|
self.read_marker_handler = hs.get_read_marker_handler()
|
||||||
|
self.presence_handler = hs.get_presence_handler()
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def on_POST(self, request, room_id, receipt_type, event_id):
|
||||||
|
requester = yield self.auth.get_user_by_req(request)
|
||||||
|
|
||||||
|
yield self.presence_handler.bump_presence_active_time(requester.user)
|
||||||
|
|
||||||
|
body = parse_json_object_from_request(request)
|
||||||
|
|
||||||
|
if "m.read" in body:
|
||||||
|
read_event_id = body["m.read"];
|
||||||
|
yield self.receipts_handler.received_client_receipt(
|
||||||
|
room_id,
|
||||||
|
"m.read",
|
||||||
|
user_id=requester.user.to_string(),
|
||||||
|
event_id=read_event_id
|
||||||
|
)
|
||||||
|
|
||||||
|
if "m.read_marker" in body:
|
||||||
|
read_marker_event_id = body["m.read_marker"]
|
||||||
|
yield self.read_marker_handler.received_client_read_marker(
|
||||||
|
room_id,
|
||||||
|
user_id=requester.user.to_string(),
|
||||||
|
event_id=read_marker_event_id
|
||||||
|
)
|
||||||
|
|
||||||
|
defer.returnValue((200, {}))
|
||||||
|
|
||||||
|
|
||||||
|
def register_servlets(hs, http_server):
|
||||||
|
ReceiptRestServlet(hs).register(http_server)
|
Loading…
Reference in a new issue