diff --git a/mautrix_telegram/commands/portal.py b/mautrix_telegram/commands/portal.py index b0df61c9..f1e01aa5 100644 --- a/mautrix_telegram/commands/portal.py +++ b/mautrix_telegram/commands/portal.py @@ -146,11 +146,6 @@ async def bridge(evt: CommandEvent): if not await _has_access_to(room_id, evt.az.intent, evt.sender, "bridge"): return await evt.reply("You do not have the permissions to bridge that room.") - levels = await evt.az.intent.get_power_levels(room_id) - power_level_error = _check_power_levels(levels, evt.az.bot_mxid) - if power_level_error: - return await evt.reply(power_level_error) - # The /id bot command provides the prefixed ID, so we assume tgid = evt.args[0] if tgid.startswith("-100"): @@ -273,24 +268,11 @@ async def _get_initial_state(evt: CommandEvent): about = event["content"]["topic"] elif event["type"] == "m.room.power_levels": levels = event["content"] + elif event["type"] == "m.room.canonical_alias": + title = title or event["content"]["alias"] return title, about, levels -def _check_power_levels(levels: dict, bot_mxid: str): - try: - if levels["users"][bot_mxid] < 100: - raise ValueError() - except (TypeError, KeyError, ValueError): - return (f"Please give [the bridge bot](https://matrix.to/#/{bot_mxid}) a power level of " - "100 before creating or bridging a Telegram chat.") - - for user, level in levels["users"].items(): - if level >= 100 and user != bot_mxid: - return (f"Please make sure only the bridge bot has power level above 99 before " - f"creating or bridging a Telegram chat.\n\n" - f"Use power level 95 instead of 100 for admins.") - - @command_handler() async def create(evt: CommandEvent): type = evt.args[0] if len(evt.args) > 0 else "group" @@ -305,10 +287,6 @@ async def create(evt: CommandEvent): if not title: return await evt.reply("Please set a title before creating a Telegram chat.") - power_level_error = _check_power_levels(levels, evt.az.bot_mxid) - if power_level_error: - return await evt.reply(power_level_error) - supergroup = type == "supergroup" type = { "supergroup": "channel", diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index 7286fcf9..b1f2d1f9 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -286,6 +286,8 @@ class Portal: levels["users"] = { self.main_intent.mxid: 100 } + else: + levels["users"][self.main_intent.mxid] = 100 return levels @property @@ -492,10 +494,13 @@ class Portal: except MatrixRequestError: members = [] for user in members: - is_puppet = p.Puppet.get_id_from_mxid(user) - if user != intent.mxid and (not puppets_only or is_puppet): + puppet = p.Puppet.get_by_mxid(user, create=False) + if user != intent.mxid and (not puppets_only or puppet): try: - await intent.kick(room_id, user, message) + if puppet: + await puppet.intent.leave_room(room_id) + else: + await intent.kick(room_id, user, message) except (MatrixRequestError, IntentError): pass await intent.leave_room(room_id) @@ -857,16 +862,18 @@ class Portal: self.tg_receiver = self.tgid self.by_tgid[self.tgid_full] = self await self.update_info(source, entity) + self.db.add(self.db_instance) self.save() - if self.bot and self.bot.mxid in invites: + if self.bot and self.bot.tgid in invites: self.bot.add_chat(self.tgid, self.peer_type) levels = await self.main_intent.get_power_levels(self.mxid) - levels = self._get_base_power_levels(levels, entity) - already_saved = await self.handle_matrix_power_levels(source, levels["users"], {}) - if not already_saved: + bot_level = self._get_bot_level(levels) + if bot_level == 100: + levels = self._get_base_power_levels(levels, entity) await self.main_intent.set_power_levels(self.mxid, levels) + await self.handle_matrix_power_levels(source, levels["users"], {}) async def invite_telegram(self, source, puppet): if self.peer_type == "chat": @@ -1159,18 +1166,41 @@ class Portal: return 0 @staticmethod - def _participant_to_power_levels(levels, user, new_level): + def _participant_to_power_levels(levels, user, new_level, bot_level): + new_level = min(new_level, bot_level) user_level_defined = user.mxid in levels["users"] - user_has_right_level = (levels["users"][user.mxid] == new_level - if user_level_defined else new_level == 0) - if not user_has_right_level: + default_level = levels["users_default"] if "users_default" in levels else 0 + user_level = levels["users"][user.mxid] if user_level_defined else default_level + if user_level != new_level and user_level < bot_level: levels["users"][user.mxid] = new_level return True return False + def _get_bot_level(self, levels): + try: + return levels["users"][self.main_intent.mxid] + except KeyError: + try: + return levels["users_default"] + except KeyError: + return 0 + + @staticmethod + def _get_powerlevel_level(levels): + try: + return levels["events"]["m.room.power_levels"] + except KeyError: + try: + return levels["state_default"] + except KeyError: + return 50 + def _participants_to_power_levels(self, participants, levels): + bot_level = self._get_bot_level(levels) + if bot_level < self._get_powerlevel_level(levels): + return False changed = False - admin_power_level = 75 if self.peer_type == "channel" else 50 + admin_power_level = min(75 if self.peer_type == "channel" else 50, bot_level) if levels["events"]["m.room.power_levels"] != admin_power_level: changed = True levels["events"]["m.room.power_levels"] = admin_power_level @@ -1182,10 +1212,12 @@ class Portal: if user: user.register_portal(self) - changed = self._participant_to_power_levels(levels, user, new_level) or changed + changed = self._participant_to_power_levels(levels, user, new_level, + bot_level) or changed if puppet: - changed = self._participant_to_power_levels(levels, puppet, new_level) or changed + changed = self._participant_to_power_levels(levels, puppet, new_level, + bot_level) or changed return changed async def update_telegram_participants(self, participants, levels=None): diff --git a/setup.py b/setup.py index 5166748e..e96746a8 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ setuptools.setup( install_requires=[ "aiohttp>=3.0.1,<4", - "mautrix-telegram>=0.1,<0.2", + "mautrix-appservice>=0.1.1,<0.2.0", "SQLAlchemy>=1.2.3,<2", "alembic>=0.9.8,<0.10", "Markdown>=2.6.11,<3",