diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py index be177ef4..a48fc885 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -18,9 +18,9 @@ from typing import Dict, Set, Tuple, Union, Iterable, TYPE_CHECKING from mautrix.bridge import BaseMatrixHandler from mautrix.types import (Event, EventType, RoomID, UserID, EventID, ReceiptEvent, ReceiptType, ReceiptEventContent, PresenceEvent, PresenceState, TypingEvent, - MessageEvent, StateEvent, RedactionEvent, RoomNameStateEventContent, + StateEvent, RedactionEvent, RoomNameStateEventContent, RoomAvatarStateEventContent, RoomTopicStateEventContent, - MemberStateEventContent, EncryptedEvent, TextMessageEventContent, + MemberStateEventContent, TextMessageEventContent, MessageType) from mautrix.errors import MatrixError @@ -338,19 +338,6 @@ class MatrixHandler(BaseMatrixHandler): self.previously_typing[room_id] = now_typing - def filter_matrix_event(self, evt: Event) -> bool: - if isinstance(evt, (TypingEvent, ReceiptEvent, PresenceEvent)): - return False - elif not isinstance(evt, (RedactionEvent, MessageEvent, StateEvent, EncryptedEvent)): - return True - if evt.content.get(self.az.real_user_content_key, False): - puppet = pu.Puppet.deprecated_sync_get_by_custom_mxid(evt.sender) - if puppet: - self.log.debug("Ignoring puppet-sent event %s", evt.event_id) - return True - return evt.sender and (evt.sender == self.az.bot_mxid - or pu.Puppet.get_id_from_mxid(evt.sender) is not None) - async def handle_ephemeral_event(self, evt: Union[ReceiptEvent, PresenceEvent, TypingEvent] ) -> None: if evt.type == EventType.RECEIPT: diff --git a/requirements.txt b/requirements.txt index 6472c092..0f823923 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ python-magic>=0.4,<0.5 commonmark>=0.8,<0.10 aiohttp>=3,<4 yarl>=1,<2 -mautrix>=0.11.3,<0.12 +mautrix>=0.11.4,<0.12 #telethon>=1.22,<1.24 # Temporary patch for 64-bit IDs until upstream telethon 2.0 is ready tulir-telethon==1.24.0a2