From 08620b3f28655c35c19b35767e8972fa3ad5740d Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 22 Feb 2022 11:38:35 -0500 Subject: Add a thread ID to receipts. --- synapse/rest/client/read_marker.py | 1 + synapse/rest/client/receipts.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'synapse/rest') diff --git a/synapse/rest/client/read_marker.py b/synapse/rest/client/read_marker.py index 8896f2df50..d170cf1560 100644 --- a/synapse/rest/client/read_marker.py +++ b/synapse/rest/client/read_marker.py @@ -81,6 +81,7 @@ class ReadMarkerRestServlet(RestServlet): receipt_type, user_id=requester.user.to_string(), event_id=event_id, + thread_id=None, # TODO ) return 200, {} diff --git a/synapse/rest/client/receipts.py b/synapse/rest/client/receipts.py index 409bfd43c1..3e4aea065a 100644 --- a/synapse/rest/client/receipts.py +++ b/synapse/rest/client/receipts.py @@ -13,7 +13,7 @@ # limitations under the License. import logging -from typing import TYPE_CHECKING, Tuple +from typing import TYPE_CHECKING, Optional, Tuple from synapse.api.constants import ReceiptTypes from synapse.api.errors import SynapseError @@ -34,7 +34,8 @@ class ReceiptRestServlet(RestServlet): PATTERNS = client_patterns( "/rooms/(?P[^/]*)" "/receipt/(?P[^/]*)" - "/(?P[^/]*)$" + "/(?P[^/]*)" + "(/(?P[^/]*))?$" ) def __init__(self, hs: "HomeServer"): @@ -51,7 +52,12 @@ class ReceiptRestServlet(RestServlet): ) async def on_POST( - self, request: SynapseRequest, room_id: str, receipt_type: str, event_id: str + self, + request: SynapseRequest, + room_id: str, + receipt_type: str, + event_id: str, + thread_id: Optional[str], ) -> Tuple[int, JsonDict]: requester = await self.auth.get_user_by_req(request) @@ -77,6 +83,7 @@ class ReceiptRestServlet(RestServlet): receipt_type, user_id=requester.user.to_string(), event_id=event_id, + thread_id=thread_id, ) return 200, {} -- cgit 1.5.1