tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Log when we receive receipt from a different origin

Browse source
This commit is contained in:
Erik Johnston 2019-07-23 13:31:03 +01:00 committed by Richard van der Hoff
parent 0f2ecb961e
commit 1f8bae7724
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
synapse/handlers/receipts.py
View file

@ -17,7 +17,7 @@ import logging
from twisted.internet import defer from twisted.internet import defer
from synapse.handlers._base import BaseHandler from synapse.handlers._base import BaseHandler
from synapse.types import ReadReceipt from synapse.types import ReadReceipt, get_domain_from_id
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -40,7 +40,19 @@ class ReceiptsHandler(BaseHandler):
def _received_remote_receipt(self, origin, content): def _received_remote_receipt(self, origin, content):
"""Called when we receive an EDU of type m.receipt from a remote HS. """Called when we receive an EDU of type m.receipt from a remote HS.
""" """
receipts = [ receipts = []
for room_id, room_values in content.items():
for receipt_type, users in room_values.items():
for user_id, user_values in users.items():
if get_domain_from_id(user_id) != origin:
logger.info(
"Received receipt for user %r from server %s, ignoring",
user_id,
origin,
)
continue
receipts.append(
ReadReceipt( ReadReceipt(
room_id=room_id, room_id=room_id,
receipt_type=receipt_type, receipt_type=receipt_type,
@ -48,10 +60,7 @@ class ReceiptsHandler(BaseHandler):
event_ids=user_values["event_ids"], event_ids=user_values["event_ids"],
data=user_values.get("data", {}), data=user_values.get("data", {}),
) )
for room_id, room_values in content.items() )
for receipt_type, users in room_values.items()
for user_id, user_values in users.items()
]
yield self._handle_new_receipts(receipts) yield self._handle_new_receipts(receipts)