Revert "Don't send delivery receipts to unencrypted private chat portals. Fixes #483"
This reverts commita4595b427d. Commita4595b4avoids sending delivery receipts to rooms that do not contain the bridge bot. That was necessary as trying to send a read marker would automatically attempt to join the bridge bot to the room. That join without invite would fail, hence #483. But since https://github.com/mautrix/python/commit/f272f16a1d151a1c6612c9349776eda985c8ea3e we no longer attempt to join the sender of read receipts, fixing #483 without necessarily sacrificing the delivery receipt functionality. Thus: -a4595b4is no longer necessary, its original purpose is fulfilled by f272f16. -a4595b4prevents delivery receipts from working in unencrypted rooms. - This revertsa4595b4, thus enabling delivery receipts in unencrypted rooms.
This commit is contained in:
@@ -1262,12 +1262,7 @@ class Portal(DBPortal, BasePortal):
|
||||
async def _send_delivery_receipt(
|
||||
self, event_id: EventID, room_id: RoomID | None = None
|
||||
) -> None:
|
||||
# TODO maybe check if the bot is in the room rather than assuming based on self.encrypted
|
||||
if (
|
||||
event_id
|
||||
and self.config["bridge.delivery_receipts"]
|
||||
and (self.encrypted or self.peer_type != "user")
|
||||
):
|
||||
if event_id and self.config["bridge.delivery_receipts"]:
|
||||
try:
|
||||
await self.az.intent.mark_read(room_id or self.mxid, event_id)
|
||||
except Exception:
|
||||
|
||||
Reference in New Issue
Block a user