From 6d1525885c1f23b409a11ac34c011f5ddf07d43c Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 10 May 2022 14:55:49 +0300 Subject: [PATCH] Fix merge mistakes --- synapse/handlers/receipts.py | 2 +- synapse/rest/client/receipts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py index 752e343d2..6a6c8b7b6 100644 --- a/synapse/handlers/receipts.py +++ b/synapse/handlers/receipts.py @@ -138,7 +138,7 @@ class ReceiptsHandler: return True async def received_client_receipt( - self, room_id: str, receipt_type: str, user_id: str, event_id: str + self, room_id: str, receipt_type: str, user_id: str, event_id: str, extra_content: Optional[JsonDict] = None, ) -> None: """Called when a client tells us a local user has read up to the given diff --git a/synapse/rest/client/receipts.py b/synapse/rest/client/receipts.py index 6385ba5c6..db5db6306 100644 --- a/synapse/rest/client/receipts.py +++ b/synapse/rest/client/receipts.py @@ -76,7 +76,7 @@ class ReceiptRestServlet(RestServlet): if pattern.match(user_agent) or "Riot" in user_agent: allow_empty_body = True # This call makes sure possible empty body is handled correctly - parse_json_object_from_request(request, allow_empty_body) + body = parse_json_object_from_request(request, allow_empty_body) await self.presence_handler.bump_presence_active_time(requester.user)