mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 15:49:51 +00:00
Fix merge mistakes
This commit is contained in:
parent
73a6f931ea
commit
6d1525885c
@ -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
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user