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

Update PollBot delete_message order

Browse Source
This commit is contained in:
AlberLC
2022-12-03 06:26:26 +01:00
parent 96d117a9fe
commit 430a141dd7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flanabot/bots/poll_bot.py
View File

@@ -131,8 +131,6 @@ class PollBot(MultiBot, ABC):
if not (poll_message := self._get_poll_message(message)): if not (poll_message := self._get_poll_message(message)):
return return
await self.delete_message(message)
if all_: if all_:
for option_name, option_votes in poll_message.buttons_info.data['votes'].items(): for option_name, option_votes in poll_message.buttons_info.data['votes'].items():
poll_message.buttons_info.data['votes'][option_name].clear() poll_message.buttons_info.data['votes'][option_name].clear()
@@ -141,6 +139,7 @@ class PollBot(MultiBot, ABC):
for option_name, option_votes in poll_message.buttons_info.data['votes'].items(): for option_name, option_votes in poll_message.buttons_info.data['votes'].items():
poll_message.buttons_info.data['votes'][option_name] = [option_vote for option_vote in option_votes if option_vote[0] != user.id] poll_message.buttons_info.data['votes'][option_name] = [option_vote for option_vote in option_votes if option_vote[0] != user.id]
await self.delete_message(message)
await self._update_poll_buttons(poll_message) await self._update_poll_buttons(poll_message)
async def _on_dice(self, message: Message): async def _on_dice(self, message: Message):
@@ -156,8 +155,6 @@ class PollBot(MultiBot, ABC):
if message.chat.is_group and not self.is_bot_mentioned(message): if message.chat.is_group and not self.is_bot_mentioned(message):
return return
await self.delete_message(message)
discarded_words = {*constants.KEYWORDS['poll'], *constants.KEYWORDS['multiple_answer'], self.name.lower(), f'<@{self.id}>'} discarded_words = {*constants.KEYWORDS['poll'], *constants.KEYWORDS['multiple_answer'], self.name.lower(), f'<@{self.id}>'}
if final_options := [f'{option[0].upper()}{option[1:]}' for option in self._get_options(message.text, discarded_words)]: if final_options := [f'{option[0].upper()}{option[1:]}' for option in self._get_options(message.text, discarded_words)]:
await self.send( await self.send(
@@ -175,6 +172,8 @@ class PollBot(MultiBot, ABC):
else: else:
await self.send(random.choice(('¿Y las opciones?', '?', '🤔')), message) await self.send(random.choice(('¿Y las opciones?', '?', '🤔')), message)
await self.delete_message(message)
async def _on_poll_button_press(self, message: Message): async def _on_poll_button_press(self, message: Message):
await self.accept_button_event(message) await self.accept_button_event(message)
if not message.buttons_info.data['is_active']: if not message.buttons_info.data['is_active']: