Skip to content
Snippets Groups Projects
Commit 7213f9bf authored by Tulir Asokan's avatar Tulir Asokan :cat2:
Browse files

Fix Matrix->Facebook read receipts

parent 60d881ca
Branches
Tags
No related merge requests found
...@@ -225,7 +225,7 @@ class MatrixHandler(BaseMatrixHandler): ...@@ -225,7 +225,7 @@ class MatrixHandler(BaseMatrixHandler):
if not portal: if not portal:
return return
timestamp = datetime.utcfromtimestamp(data.get("ts", int(time.time() * 1000)) / 1000) timestamp = datetime.fromtimestamp(data.get("ts", int(time.time() * 1000)) / 1000)
await user.client.mark_as_read([portal.thread_for(user)], at=timestamp) await user.client.mark_as_read([portal.thread_for(user)], at=timestamp)
def filter_matrix_event(self, evt: Event) -> bool: def filter_matrix_event(self, evt: Event) -> bool:
......
...@@ -569,6 +569,9 @@ class Portal(BasePortal): ...@@ -569,6 +569,9 @@ class Portal(BasePortal):
event_ids = [await self._handle_facebook_text(intent, message)] event_ids = [await self._handle_facebook_text(intent, message)]
else: else:
self.log.warning(f"Unhandled Messenger message: {message}") self.log.warning(f"Unhandled Messenger message: {message}")
return
if event_ids:
self._last_bridged_mxid = event_ids[-1]
DBMessage.bulk_create(fbid=message.id, fb_receiver=self.fb_receiver, mx_room=self.mxid, DBMessage.bulk_create(fbid=message.id, fb_receiver=self.fb_receiver, mx_room=self.mxid,
event_ids=[event_id for event_id in event_ids if event_id]) event_ids=[event_id for event_id in event_ids if event_id])
await source.client.mark_as_delivered(message) await source.client.mark_as_delivered(message)
...@@ -655,7 +658,6 @@ class Portal(BasePortal): ...@@ -655,7 +658,6 @@ class Portal(BasePortal):
else: else:
self.log.warning(f"Unsupported attachment type: {attachment}") self.log.warning(f"Unsupported attachment type: {attachment}")
return None return None
self._last_bridged_mxid = event_id
return event_id return event_id
async def _convert_facebook_location(self, intent: IntentAPI, async def _convert_facebook_location(self, intent: IntentAPI,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment