{r_msg_link} {r_sender_link}\n{r_html_body}
{r_msg_link} {r_sender_link}\n{r_html_body}
bridge.permissions section in your config file.")
- await self.az.intent.leave_room(room)
+ await self.az.intent.leave_room(room_id)
- async def handle_invite(self, room, user, inviter):
- self.log.debug(f"{inviter} invited {user} to {room}")
- inviter = await User.get_by_mxid(inviter).ensure_started()
- if user == self.az.bot_mxid:
- return await self.accept_bot_invite(room, inviter)
+ async def handle_invite(self, room_id: str, user_id: str, inviter_mxid: str):
+ self.log.debug(f"{inviter_mxid} invited {user_id} to {room_id}")
+ inviter = await u.User.get_by_mxid(inviter_mxid).ensure_started()
+ if user_id == self.az.bot_mxid:
+ return await self.accept_bot_invite(room_id, inviter)
elif not inviter.whitelisted:
return
- puppet = Puppet.get_by_mxid(user)
+ puppet = pu.Puppet.get_by_mxid(user_id)
if puppet:
- await self.handle_puppet_invite(room, puppet, inviter)
+ await self.handle_puppet_invite(room_id, puppet, inviter)
return
- user = User.get_by_mxid(user, create=False)
+ user = u.User.get_by_mxid(user_id, create=False)
if not user:
return
await user.ensure_started()
- portal = Portal.get_by_mxid(room)
+ portal = po.Portal.get_by_mxid(room_id)
if user and await user.has_full_access(allow_bot=True) and portal:
await portal.invite_telegram(inviter, user)
return
# The rest can probably be ignored
- async def handle_join(self, room, user, event_id):
- user = await User.get_by_mxid(user).ensure_started()
+ async def handle_join(self, room_id: str, user_id: str, event_id: str):
+ user = await u.User.get_by_mxid(user_id).ensure_started()
- portal = Portal.get_by_mxid(room)
+ portal = po.Portal.get_by_mxid(room_id)
if not portal:
return
if not user.relaybot_whitelisted:
- await portal.main_intent.kick(room, user.mxid,
+ await portal.main_intent.kick(room_id, user.mxid,
"You are not whitelisted on this Telegram bridge.")
return
elif not await user.is_logged_in() and not portal.has_bot:
- await portal.main_intent.kick(room, user.mxid,
+ await portal.main_intent.kick(room_id, user.mxid,
"This chat does not have a bot relaying "
"messages for unauthenticated users.")
return
- self.log.debug(f"{user} joined {room}")
+ self.log.debug(f"{user} joined {room_id}")
if await user.is_logged_in() or portal.has_bot:
await portal.join_matrix(user, event_id)
- async def handle_part(self, room, user, sender, event_id):
- self.log.debug(f"{user} left {room}")
+ async def handle_part(self, room_id: str, user_id, sender_mxid: str, event_id: str):
+ self.log.debug(f"{user_id} left {room_id}")
- sender = User.get_by_mxid(sender, create=False)
+ sender = u.User.get_by_mxid(sender_mxid, create=False)
if not sender:
return
await sender.ensure_started()
- portal = Portal.get_by_mxid(room)
+ portal = po.Portal.get_by_mxid(room_id)
if not portal:
return
- puppet = Puppet.get_by_mxid(user)
+ puppet = pu.Puppet.get_by_mxid(user_id)
if sender and puppet:
await portal.leave_matrix(puppet, sender, event_id)
- user = User.get_by_mxid(user, create=False)
+ user = u.User.get_by_mxid(user_id, create=False)
if not user:
return
await user.ensure_started()
if await user.is_logged_in() or portal.has_bot:
await portal.leave_matrix(user, sender, event_id)
- def is_command(self, message):
+ def is_command(self, message: dict) -> Tuple[bool, str]:
text = message.get("body", "")
prefix = self.config["bridge.command_prefix"]
is_command = text.startswith(prefix)
@@ -192,19 +204,19 @@ class MatrixHandler:
async def handle_message(self, room, sender, message, event_id):
is_command, text = self.is_command(message)
- sender = await User.get_by_mxid(sender).ensure_started()
+ sender = await u.User.get_by_mxid(sender).ensure_started()
if not sender.relaybot_whitelisted:
self.log.debug(f"Ignoring message \"{message}\" from {sender} to {room}:"
- " User is not whitelisted.")
+ " u.User is not whitelisted.")
return
- self.log.debug("Received Matrix event \"{message}\" from {sender} in {room}")
+ self.log.debug(f"Received Matrix event \"{message}\" from {sender} in {room}")
- portal = Portal.get_by_mxid(room)
+ portal = po.Portal.get_by_mxid(room)
if not is_command and portal and (await sender.is_logged_in() or portal.has_bot):
await portal.handle_matrix_message(sender, message, event_id)
return
- if not sender.whitelisted or message["msgtype"] != "m.text":
+ if not sender.whitelisted or message.get("msgtype", "m.unknown") != "m.text":
return
try:
@@ -224,39 +236,44 @@ class MatrixHandler:
await self.commands.handle(room, sender, command, args, is_management,
is_portal=portal is not None)
- async def handle_redaction(self, room, sender, event_id):
- sender = await User.get_by_mxid(sender).ensure_started()
+ @staticmethod
+ async def handle_redaction(room_id: str, sender_mxid: str, event_id: str):
+ sender = await u.User.get_by_mxid(sender_mxid).ensure_started()
if not sender.relaybot_whitelisted:
return
- portal = Portal.get_by_mxid(room)
+ portal = po.Portal.get_by_mxid(room_id)
if not portal:
return
await portal.handle_matrix_deletion(sender, event_id)
- async def handle_power_levels(self, room, sender, new, old):
- portal = Portal.get_by_mxid(room)
- sender = await User.get_by_mxid(sender).ensure_started()
+ @staticmethod
+ async def handle_power_levels(room_id: str, sender_mxid: str, new: dict, old: dict):
+ portal = po.Portal.get_by_mxid(room_id)
+ sender = await u.User.get_by_mxid(sender_mxid).ensure_started()
if await sender.has_full_access(allow_bot=True) and portal:
await portal.handle_matrix_power_levels(sender, new["users"], old["users"])
- async def handle_room_meta(self, type, room, sender, content):
- portal = Portal.get_by_mxid(room)
- sender = await User.get_by_mxid(sender).ensure_started()
+ @staticmethod
+ async def handle_room_meta(evt_type: str, room_id: str, sender_mxid: str, content: dict):
+ portal = po.Portal.get_by_mxid(room_id)
+ sender = await u.User.get_by_mxid(sender_mxid).ensure_started()
if await sender.has_full_access(allow_bot=True) and portal:
handler, content_key = {
"m.room.name": (portal.handle_matrix_title, "name"),
"m.room.topic": (portal.handle_matrix_about, "topic"),
"m.room.avatar": (portal.handle_matrix_avatar, "url"),
- }[type]
+ }[evt_type]
if content_key not in content:
return
await handler(sender, content[content_key])
- async def handle_room_pin(self, room, sender, new_events, old_events):
- portal = Portal.get_by_mxid(room)
- sender = await User.get_by_mxid(sender).ensure_started()
+ @staticmethod
+ async def handle_room_pin(room_id: str, sender_mxid: str, new_events: Set[str],
+ old_events: Set[str]):
+ portal = po.Portal.get_by_mxid(room_id)
+ sender = await u.User.get_by_mxid(sender_mxid).ensure_started()
if await sender.has_full_access(allow_bot=True) and portal:
events = new_events - old_events
if len(events) > 0:
@@ -266,38 +283,93 @@ class MatrixHandler:
# All pinned events removed, remove pinned event in Telegram.
await portal.handle_matrix_pin(sender, None)
- async def handle_name_change(self, room, user, displayname, prev_displayname, event_id):
- portal = Portal.get_by_mxid(room)
+ @staticmethod
+ async def handle_name_change(room_id: str, user_id: str, displayname: str,
+ prev_displayname: str, event_id: str):
+ portal = po.Portal.get_by_mxid(room_id)
if not portal or not portal.has_bot:
return
- user = await User.get_by_mxid(user).ensure_started()
+ user = await u.User.get_by_mxid(user_id).ensure_started()
if await user.needs_relaybot(portal):
await portal.name_change_matrix(user, displayname, prev_displayname, event_id)
- def filter_matrix_event(self, event):
- return (event["sender"] == self.az.bot_mxid
- or Puppet.get_id_from_mxid(event["sender"]) is not None)
+ @staticmethod
+ def parse_read_receipts(content: dict) -> Dict[str, str]:
+ return {user_id: event_id
+ for event_id, receipts in content.items()
+ for user_id in receipts.get("m.read", {})}
- async def handle_event(self, evt):
+ @staticmethod
+ async def handle_read_receipts(room_id: str, receipts: Dict[str, str]):
+ portal = po.Portal.get_by_mxid(room_id)
+ if not portal:
+ return
+
+ for user_id, event_id in receipts.items():
+ user = await u.User.get_by_mxid(user_id).ensure_started()
+ if not await user.is_logged_in():
+ continue
+ await portal.mark_read(user, event_id)
+
+ @staticmethod
+ async def handle_presence(user_id: str, presence: str):
+ user = await u.User.get_by_mxid(user_id).ensure_started()
+ if not await user.is_logged_in():
+ return
+ await user.set_presence(presence == "online")
+
+ async def handle_typing(self, room_id: str, now_typing: List[str]):
+ portal = po.Portal.get_by_mxid(room_id)
+ if not portal:
+ return
+
+ for user_id in set(self.previously_typing + now_typing):
+ is_typing = user_id in now_typing
+ was_typing = user_id in self.previously_typing
+ if is_typing and was_typing:
+ continue
+
+ user = await u.User.get_by_mxid(user_id).ensure_started()
+ if not await user.is_logged_in():
+ continue
+
+ await portal.set_typing(user, is_typing)
+
+ self.previously_typing = now_typing
+
+ def filter_matrix_event(self, event: dict):
+ sender = event.get("sender", None)
+ if not sender:
+ return False
+ return (sender == self.az.bot_mxid
+ or pu.Puppet.get_id_from_mxid(sender) is not None)
+
+ async def try_handle_event(self, evt: dict):
+ try:
+ await self.handle_event(evt)
+ except Exception:
+ self.log.exception("Error handling manually received Matrix event")
+
+ async def handle_event(self, evt: dict):
if self.filter_matrix_event(evt):
return
self.log.debug("Received event: %s", evt)
- type = evt["type"]
- room_id = evt["room_id"]
- event_id = evt["event_id"]
- sender = evt["sender"]
- content = evt.get("content", {})
- if type == "m.room.member":
- state_key = evt["state_key"]
- prev_content = evt.get("unsigned", {}).get("prev_content", {})
- membership = content.get("membership", "")
- prev_membership = prev_content.get("membership", "leave")
+ evt_type = evt.get("type", "m.unknown") # type: str
+ room_id = evt.get("room_id", None) # type: str
+ event_id = evt.get("event_id", None) # type: str
+ sender = evt.get("sender", None) # type: str
+ content = evt.get("content", {}) # type: dict
+ if evt_type == "m.room.member":
+ state_key = evt["state_key"] # type: str
+ prev_content = evt.get("unsigned", {}).get("prev_content", {}) # type: dict
+ membership = content.get("membership", "") # type: str
+ prev_membership = prev_content.get("membership", "leave") # type: str
if membership == prev_membership:
- match = re.compile("@(.+):(.+)").match(state_key)
- localpart = match.group(1)
- displayname = content.get("displayname", localpart)
- prev_displayname = prev_content.get("displayname", localpart)
+ match = re.compile("@(.+):(.+)").match(state_key) # type: Match
+ localpart = match.group(1) # type: str
+ displayname = content.get("displayname", localpart) # type: str
+ prev_displayname = prev_content.get("displayname", localpart) # type: str
if displayname != prev_displayname:
await self.handle_name_change(room_id, state_key, displayname,
prev_displayname, event_id)
@@ -307,20 +379,26 @@ class MatrixHandler:
await self.handle_part(room_id, state_key, sender, event_id)
elif membership == "join":
await self.handle_join(room_id, state_key, event_id)
- elif type in ("m.room.message", "m.sticker"):
- if type != "m.room.message":
- content["msgtype"] = type
+ elif evt_type in ("m.room.message", "m.sticker"):
+ if evt_type != "m.room.message":
+ content["msgtype"] = evt_type
await self.handle_message(room_id, sender, content, event_id)
- elif type == "m.room.redaction":
+ elif evt_type == "m.room.redaction":
await self.handle_redaction(room_id, sender, evt["redacts"])
- elif type == "m.room.power_levels":
+ elif evt_type == "m.room.power_levels":
await self.handle_power_levels(room_id, sender, evt["content"], evt["prev_content"])
- elif type in ("m.room.name", "m.room.avatar", "m.room.topic"):
- await self.handle_room_meta(type, room_id, sender, evt["content"])
- elif type == "m.room.pinned_events":
+ elif evt_type in ("m.room.name", "m.room.avatar", "m.room.topic"):
+ await self.handle_room_meta(evt_type, room_id, sender, evt["content"])
+ elif evt_type == "m.room.pinned_events":
new_events = set(evt["content"]["pinned"])
try:
old_events = set(evt["unsigned"]["prev_content"]["pinned"])
except KeyError:
old_events = set()
await self.handle_room_pin(room_id, sender, new_events, old_events)
+ elif evt_type == "m.receipt":
+ await self.handle_read_receipts(room_id, self.parse_read_receipts(content))
+ elif evt_type == "m.presence":
+ await self.handle_presence(sender, content.get("presence", "offline"))
+ elif evt_type == "m.typing":
+ await self.handle_typing(room_id, content.get("user_ids", []))
diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py
index 35872438..a4f80776 100644
--- a/mautrix_telegram/portal.py
+++ b/mautrix_telegram/portal.py
@@ -14,6 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see