Fix redaction checkpoints
This commit is contained in:
@@ -510,21 +510,20 @@ class PortalMatrix(BasePortal, ABC):
|
|||||||
async def handle_matrix_deletion(self, deleter: 'u.User', event_id: EventID,
|
async def handle_matrix_deletion(self, deleter: 'u.User', event_id: EventID,
|
||||||
redaction_event_id: EventID) -> None:
|
redaction_event_id: EventID) -> None:
|
||||||
try:
|
try:
|
||||||
await self._handle_matrix_deletion(deleter, event_id, redaction_event_id)
|
await self._handle_matrix_deletion(deleter, event_id)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.log.debug(str(e))
|
self.log.debug(str(e))
|
||||||
await self._send_bridge_error(deleter, e, event_id, EventType.ROOM_REDACTION)
|
await self._send_bridge_error(deleter, e, redaction_event_id, EventType.ROOM_REDACTION)
|
||||||
else:
|
else:
|
||||||
deleter.send_remote_checkpoint(
|
deleter.send_remote_checkpoint(
|
||||||
MessageSendCheckpointStatus.SUCCESS,
|
MessageSendCheckpointStatus.SUCCESS,
|
||||||
event_id,
|
redaction_event_id,
|
||||||
self.mxid,
|
self.mxid,
|
||||||
EventType.ROOM_REDACTION,
|
EventType.ROOM_REDACTION,
|
||||||
)
|
)
|
||||||
await self._send_delivery_receipt(redaction_event_id)
|
await self._send_delivery_receipt(redaction_event_id)
|
||||||
|
|
||||||
async def _handle_matrix_deletion(self, deleter: 'u.User', event_id: EventID,
|
async def _handle_matrix_deletion(self, deleter: 'u.User', event_id: EventID) -> None:
|
||||||
redaction_event_id: EventID) -> None:
|
|
||||||
real_deleter = deleter if not await deleter.needs_relaybot(self) else self.bot
|
real_deleter = deleter if not await deleter.needs_relaybot(self) else self.bot
|
||||||
space = self.tgid if self.peer_type == "channel" else real_deleter.tgid
|
space = self.tgid if self.peer_type == "channel" else real_deleter.tgid
|
||||||
message = DBMessage.get_by_mxid(event_id, self.mxid, space)
|
message = DBMessage.get_by_mxid(event_id, self.mxid, space)
|
||||||
|
|||||||
Reference in New Issue
Block a user