Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-08-08 16:02:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge mistakes

Browse source
This commit is contained in:
Tulir Asokan 2022-05-10 14:55:49 +03:00
parent 73a6f931ea
commit 6d1525885c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/handlers/receipts.py
View file

@ -138,7 +138,7 @@ class ReceiptsHandler:
return True return True
async def received_client_receipt( 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, extra_content: Optional[JsonDict] = None,
) -> None: ) -> None:
"""Called when a client tells us a local user has read up to the given """Called when a client tells us a local user has read up to the given

2
synapse/rest/client/receipts.py
View file

@ -76,7 +76,7 @@ class ReceiptRestServlet(RestServlet):
if pattern.match(user_agent) or "Riot" in user_agent: if pattern.match(user_agent) or "Riot" in user_agent:
allow_empty_body = True allow_empty_body = True
# This call makes sure possible empty body is handled correctly # 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) await self.presence_handler.bump_presence_active_time(requester.user)