spawnrys/flanabot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handlers in Telegram

Browse Source
This commit is contained in:
AlberLC
2022-12-11 22:08:08 +01:00
parent 16b38ae257
commit 572800571d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flanabot/bots/flana_bot.py
View File

@@ -68,7 +68,7 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, WeatherBot, MultiBo
self.register_button(self._on_users_button_press, ButtonsGroup.USERS) self.register_button(self._on_users_button_press, ButtonsGroup.USERS)
async def _changeable_roles(self, group_: int | str | Chat | Message) -> list[Role]: async def _changeable_roles(self, group_: int | str | Chat | Message) -> list[Role]:
pass return []
@return_if_first_empty(exclude_self_types='FlanaBot', globals_=globals()) @return_if_first_empty(exclude_self_types='FlanaBot', globals_=globals())
async def _get_message( async def _get_message(
@@ -125,8 +125,8 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, WeatherBot, MultiBo
return return
buttons_texts = [(f"{'✔' if v else '❌'} {k}", v) for k, v in message.chat.config.items()] buttons_texts = [(f"{'✔' if v else '❌'} {k}", v) for k, v in message.chat.config.items()]
await self.delete_message(message)
await self.send('<b>Estos son los ajustes del chat:</b>\n\n', flanautils.chunks(buttons_texts, 3), message, buttons_key=ButtonsGroup.CONFIG) await self.send('<b>Estos son los ajustes del chat:</b>\n\n', flanautils.chunks(buttons_texts, 3), message, buttons_key=ButtonsGroup.CONFIG)
await self.delete_message(message)
async def _on_config_button_press(self, message: Message): async def _on_config_button_press(self, message: Message):
await self.accept_button_event(message) await self.accept_button_event(message)
@@ -266,7 +266,6 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, WeatherBot, MultiBo
if not (options := await self._role_state_options(message, user_role_names)): if not (options := await self._role_state_options(message, user_role_names)):
return return
await self.delete_message(message)
await self.send( await self.send(
f'<b>Roles de {message.author.name}:</b>', f'<b>Roles de {message.author.name}:</b>',
self.distribute_buttons(options, vertically=True), self.distribute_buttons(options, vertically=True),
@@ -274,6 +273,7 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, WeatherBot, MultiBo
buttons_key=ButtonsGroup.ROLES, buttons_key=ButtonsGroup.ROLES,
buttons_data={'user_id': message.author.id} buttons_data={'user_id': message.author.id}
) )
await self.delete_message(message)
async def _on_roles_button_press(self, message: Message): async def _on_roles_button_press(self, message: Message):
await self.accept_button_event(message) await self.accept_button_event(message)
@@ -298,7 +298,9 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, WeatherBot, MultiBo
@group @group
@bot_mentioned @bot_mentioned
async def _on_users(self, message: Message): async def _on_users(self, message: Message):
role_names = [role.name for role in await self.get_group_roles(message.chat.group_id)] if not (role_names := [role.name for role in await self.get_group_roles(message.chat.group_id)]):
return
try: try:
role_names.remove('@everyone') role_names.remove('@everyone')
except ValueError: except ValueError:
@@ -306,7 +308,6 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, WeatherBot, MultiBo
user_names = [f'<@{user.id}>' for user in await self.find_users_by_roles([], message)] user_names = [f'<@{user.id}>' for user in await self.find_users_by_roles([], message)]
joined_user_names = ', '.join(user_names) joined_user_names = ', '.join(user_names)
await self.delete_message(message)
bot_message = await self.send( bot_message = await self.send(
f"<b>{len(user_names)} usuario{'' if len(user_names) == 1 else 's'}:</b>", f"<b>{len(user_names)} usuario{'' if len(user_names) == 1 else 's'}:</b>",
message message
@@ -317,6 +318,7 @@ class FlanaBot(Connect4Bot, PenaltyBot, PollBot, ScraperBot, WeatherBot, MultiBo
bot_message, bot_message,
buttons_key=ButtonsGroup.USERS buttons_key=ButtonsGroup.USERS
) )
await self.delete_message(message)
async def _on_users_button_press(self, message: Message): async def _on_users_button_press(self, message: Message):
await self.accept_button_event(message) await self.accept_button_event(message)