Fix _on_choose

docker-compose.yaml

@@ -7,6 +7,8 @@ services:
 
   mongodb:
     image: mongo
+    ports:
+      - "27017:27017"
     environment:
       - MONGO_INITDB_ROOT_USERNAME=${MONGO_USER}
       - MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD}

flanabot/bots/flana_bot.py

@@ -1,21 +1,25 @@
+__all__ = ['FlanaBot']
+
 import asyncio
 import datetime
 import random
+import re
 import time as time_module
 from abc import ABC
 from asyncio import Future
-from typing import Iterable
+from typing import Iterable, Sequence
 
 import flanaapis.geolocation.functions
 import flanaapis.weather.functions
 import flanautils
 import plotly.graph_objects
+import pymongo
 from flanaapis import InstagramLoginError, MediaNotFoundError, Place, PlaceNotFoundError, WeatherEmoji, instagram, tiktok, twitter
 from flanautils import Media, MediaType, NotFoundError, OrderedSet, Source, TimeUnits, TraceMetadata, return_if_first_empty
-from multibot import Action, BadRoleError, BotAction, MultiBot, SendError, User, admin, bot_mentioned, constants as multibot_constants, group, ignore_self_message, inline, reply
+from multibot import Action, BadRoleError, BotAction, ButtonsGroup, MultiBot, SendError, User, admin, bot_mentioned, constants as multibot_constants, group, ignore_self_message, inline, reply
 
 from flanabot import constants
-from flanabot.models import ButtonsMessageType, Chat, Message, Punishment, WeatherChart
+from flanabot.models import Chat, Message, Punishment, WeatherChart
 
 
 # ----------------------------------------------------------------------------------------------------- #
@@ -34,6 +38,10 @@ class FlanaBot(MultiBot, ABC):
 
         self.register(self._on_bye, multibot_constants.KEYWORDS['bye'])
 
+        self.register(self._on_choose, constants.KEYWORDS['choose'])
+        self.register(self._on_choose, constants.KEYWORDS['random'])
+        self.register(self._on_choose, (constants.KEYWORDS['choose'], constants.KEYWORDS['random']))
+
         self.register(self._on_config_list_show, multibot_constants.KEYWORDS['config'])
         self.register(self._on_config_list_show, (multibot_constants.KEYWORDS['show'], multibot_constants.KEYWORDS['config']))
 
@@ -76,6 +84,8 @@ class FlanaBot(MultiBot, ABC):
         self.register(self._on_delete_original_config_show, (multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message'], multibot_constants.KEYWORDS['config']))
         self.register(self._on_delete_original_config_show, (multibot_constants.KEYWORDS['show'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message'], multibot_constants.KEYWORDS['config']))
 
+        self.register(self._on_dice, constants.KEYWORDS['dice'])
+
         self.register(self._on_hello, multibot_constants.KEYWORDS['hello'])
 
         self.register(self._on_new_message_default, default=True)
@@ -85,6 +95,8 @@ class FlanaBot(MultiBot, ABC):
         self.register(self._on_no_delete_original, (multibot_constants.KEYWORDS['negate'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message']))
         self.register(self._on_no_delete_original, (multibot_constants.KEYWORDS['deactivate'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message']))
 
+        self.register(self._on_poll, constants.KEYWORDS['poll'])
+
         self.register(self._on_punish, constants.KEYWORDS['punish'])
         self.register(self._on_punish, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['unpunish']))
         self.register(self._on_punish, (multibot_constants.KEYWORDS['deactivate'], multibot_constants.KEYWORDS['permission']))
@@ -108,6 +120,11 @@ class FlanaBot(MultiBot, ABC):
 
         self.register(self._on_song_info, constants.KEYWORDS['song_info'])
 
+        self.register(self._on_stop_poll, multibot_constants.KEYWORDS['deactivate'])
+        self.register(self._on_stop_poll, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['poll']))
+        self.register(self._on_stop_poll, multibot_constants.KEYWORDS['stop'])
+        self.register(self._on_stop_poll, (multibot_constants.KEYWORDS['stop'], constants.KEYWORDS['poll']))
+
         self.register(self._on_unpunish, constants.KEYWORDS['unpunish'])
 
         self.register(self._on_unpunish, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['punish']))
@@ -128,7 +145,9 @@ class FlanaBot(MultiBot, ABC):
         self.register(self._on_weather_chart_config_show, (constants.KEYWORDS['weather_chart'], multibot_constants.KEYWORDS['config']))
         self.register(self._on_weather_chart_config_show, (multibot_constants.KEYWORDS['show'], constants.KEYWORDS['weather_chart'], multibot_constants.KEYWORDS['config']))
 
-        self.register_button(self._on_button_press)
+        self.register_button(self._on_config_button_press, ButtonsGroup.CONFIG)
+        self.register_button(self._on_poll_button_press, ButtonsGroup.POLL)
+        self.register_button(self._on_weather_button_press, ButtonsGroup.WEATHER)
 
     async def _change_config(self, config_name: str, message: Message, value: bool = None):
         if value is None:
@@ -148,20 +167,15 @@ class FlanaBot(MultiBot, ABC):
         last_2s_messages = Message.find({
             'platform': self.platform.value,
             'author': message.author.object_id,
-            'last_update': {
-                '$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=2)
-            }
+            'last_update': {'$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=2)}
         })
         last_7s_messages = Message.find({
             'platform': self.platform.value,
             'author': message.author.object_id,
-            'last_update': {
-                '$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=7),
-                '$lt': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=2)
-            }
+            'last_update': {'$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=7)}
         })
 
-        if len(last_2s_messages) >= 5 or len(last_7s_messages) >= 7:
+        if len(last_2s_messages) >= constants.FLOOD_2s_LIMIT or len(last_7s_messages) >= constants.FLOOD_7s_LIMIT:
             n_punishments = len(Punishment.find({
                 'platform': self.platform.value,
                 'user_id': message.author.id,
@@ -175,19 +189,8 @@ class FlanaBot(MultiBot, ABC):
             else:
                 await self.send(f'Castigado durante {TimeUnits(seconds=punishment_seconds).to_words()}.', message)
 
-    @staticmethod
-    def _get_config_buttons(config: dict | Chat | Message) -> list[list[str]]:
-        match config:
-            case Chat() as chat:
-                config = chat.config
-            case Message() as message:
-                config = message.chat.config
-
-        buttons_texts = [f"{'✔' if v else '❌'}  {k}" for k, v in config.items()]
-        return flanautils.chunks(buttons_texts, 3)
-
     @return_if_first_empty(exclude_self_types='FlanaBot', globals_=globals())
-    async def _manage_exceptions(self, exceptions: BaseException | Iterable[BaseException], message: Message):
+    async def _manage_exceptions(self, exceptions: BaseException | Iterable[BaseException], context: Chat | Message):
         if not isinstance(exceptions, Iterable):
             exceptions = (exceptions,)
 
@@ -195,15 +198,15 @@ class FlanaBot(MultiBot, ABC):
             try:
                 raise exception
             except BadRoleError as e:
-                await self.send_error(f'Rol no encontrado en {e}', message)
+                await self.send_error(f'Rol no encontrado en {e}', context)
             except InstagramLoginError as e:
-                await self.send_error(f'No me puedo loguear en Instagram  {random.choice(multibot_constants.SAD_EMOJIS)}  👉  {e}', message)
+                await self.send_error(f'No me puedo loguear en Instagram  {random.choice(multibot_constants.SAD_EMOJIS)}  👉  {e}', context)
             except MediaNotFoundError as e:
-                await self.send_error(f'No he podido sacar nada de {e.source}  {random.choice(multibot_constants.SAD_EMOJIS)}', message)
+                await self.send_error(f'No he podido sacar nada de {e.source}  {random.choice(multibot_constants.SAD_EMOJIS)}', context)
             except PlaceNotFoundError as e:
-                await self.send_error(f'No he podido encontrar "{e}"  {random.choice(multibot_constants.SAD_EMOJIS)}', message)
+                await self.send_error(f'No he podido encontrar "{e}"  {random.choice(multibot_constants.SAD_EMOJIS)}', context)
             except Exception as e:
-                await super()._manage_exceptions(e, message)
+                await super()._manage_exceptions(e, context)
 
     @staticmethod
     def _medias_sended_info(medias: Iterable[Media]) -> str:
@@ -266,7 +269,7 @@ class FlanaBot(MultiBot, ABC):
             return_exceptions=True
         )
 
-        if not message.is_inline and (self.is_bot_mentioned(message) or not message.chat.is_group):
+        if not message.is_inline and (self.is_bot_mentioned(message) or message.chat.is_private):
             while not results.done():
                 if constants.SCRAPING_MESSAGE_WAITING_TIME <= time_module.perf_counter() - start_time:
                     bot_state_message = await self.send(random.choice(constants.SCRAPING_PHRASES), message)
@@ -292,60 +295,39 @@ class FlanaBot(MultiBot, ABC):
     # ---------------------------------------------- #
     #                    HANDLERS                    #
     # ---------------------------------------------- #
-    async def _on_button_press(self, message: Message):
+    async def _on_bye(self, message: Message):
+        if message.chat.is_private or self.is_bot_mentioned(message):
+            await self.send_bye(message)
+
+    async def _on_choose(self, message: Message):
+        if message.chat.is_group and not self.is_bot_mentioned(message):
+            return
+
+        discarded_words = {*constants.KEYWORDS['choose'], *constants.KEYWORDS['random'], self.name.lower(), f'<@{self.id}>'}
+        if final_words := [word for word in message.text.split() if not flanautils.cartesian_product_string_matching(word.lower(), discarded_words, min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT)]:
+            await self.send(random.choice(final_words), message)
+        else:
+            await self.send(random.choice(('¿Que elija el qué?', '¿Y las opciones?', '?', '🤔')), message)
+
+    async def _on_config_button_press(self, message: Message):
         await self._accept_button_event(message)
 
-        match message.button_pressed_text:
-            case WeatherEmoji.ZOOM_IN.value:
-                buttons_message_type = ButtonsMessageType.WEATHER
-                message.weather_chart.zoom_in()
-            case WeatherEmoji.ZOOM_OUT.value:
-                buttons_message_type = ButtonsMessageType.WEATHER
-                message.weather_chart.zoom_out()
-            case WeatherEmoji.LEFT.value:
-                buttons_message_type = ButtonsMessageType.WEATHER
-                message.weather_chart.move_left()
-            case WeatherEmoji.RIGHT.value:
-                buttons_message_type = ButtonsMessageType.WEATHER
-                message.weather_chart.move_right()
-            case WeatherEmoji.PRECIPITATION_VOLUME.value:
-                buttons_message_type = ButtonsMessageType.WEATHER
-                message.weather_chart.trace_metadatas['rain_volume'].show = not message.weather_chart.trace_metadatas['rain_volume'].show
-                message.weather_chart.trace_metadatas['snow_volume'].show = not message.weather_chart.trace_metadatas['snow_volume'].show
-            case emoji if emoji in WeatherEmoji.values:
-                buttons_message_type = ButtonsMessageType.WEATHER
-                trace_metadata_name = WeatherEmoji(emoji).name.lower()
-                message.weather_chart.trace_metadatas[trace_metadata_name].show = not message.weather_chart.trace_metadatas[trace_metadata_name].show
-            case _ if message.button_pressed_user.is_admin and 'auto_' in (config := message.button_pressed_text.split()[1]):
-                buttons_message_type = ButtonsMessageType.CONFIG
-                message.chat.config[config] = not message.chat.config[config]
-                message.save()
-                await self.edit('<b>Estos son los ajustes del grupo:</b>\n\n', self._get_config_buttons(message), message)
-            case _:
-                return
+        if message.buttons_info.presser_user.is_admin is False:
+            return
 
-        if buttons_message_type is ButtonsMessageType.WEATHER:
-            message.weather_chart.apply_zoom()
-            message.weather_chart.draw()
-            message.save()
+        config = message.buttons_info.pressed_text.split()[1]
+        message.chat.config[config] = not message.chat.config[config]
+        pressed_button = message.buttons_info[message.buttons_info.pressed_text]
+        pressed_button.is_checked = not pressed_button.is_checked
+        pressed_button.text = f"{'✔' if pressed_button.is_checked else '❌'}  {config}"
 
-            image_bytes = message.weather_chart.to_image()
-            await self.edit(Media(image_bytes, MediaType.IMAGE), message)
-
-    async def _on_bye(self, message: Message):
-        if not message.chat.is_group or self.is_bot_mentioned(message):
-            await self.send_bye(message)
+        await self.edit('<b>Estos son los ajustes del grupo:</b>\n\n', message.buttons_info.buttons, message)
 
     @group
     @bot_mentioned
     async def _on_config_list_show(self, message: Message):
-        # config_info = pprint.pformat(message.chat.config)
-        # config_info = flanautils.translate(config_info, {'{': None, '}': None, ',': None, 'True': '', "'": None, 'False': '❌'})
-        # config_info = config_info.splitlines()
-        # config_info = '\n'.join(config_info_.strip() for config_info_ in config_info)
-        # await self.send(f'<b>Estos son los ajustes del grupo:</b>\n\n<code>{config_info}</code>', message)
-
-        await self.send('<b>Estos son los ajustes del grupo:</b>\n\n', self._get_config_buttons(message), message)
+        buttons_texts = [(f"{'✔' if v else '❌'}  {k}", v) for k, v in message.chat.config.items()]
+        await self.send('<b>Estos son los ajustes del grupo:</b>\n\n', flanautils.chunks(buttons_texts, 3), message, buttons_key=ButtonsGroup.CONFIG)
 
     async def _on_covid_chart(self, message: Message):  # todo2
         pass
@@ -401,8 +383,17 @@ class FlanaBot(MultiBot, ABC):
     async def _on_delete_original_config_show(self, message: Message):
         await self._show_config('auto_delete_original', message)
 
+    async def _on_dice(self, message: Message):
+        if message.chat.is_group and not self.is_bot_mentioned(message):
+            return
+
+        if top_number := flanautils.sum_numbers_in_text(message.text):
+            await self.send(random.randint(1, top_number), message)
+        else:
+            await self.send(random.choice(('¿De cuántas caras?', '¿Y el número?', '?', '🤔')), message)
+
     async def _on_hello(self, message: Message):
-        if not message.chat.is_group or self.is_bot_mentioned(message):
+        if message.chat.is_private or self.is_bot_mentioned(message):
             await self.send_hello(message)
 
     async def _on_new_message_default(self, message: Message):
@@ -446,6 +437,55 @@ class FlanaBot(MultiBot, ABC):
         if not await self._on_scraping(message, delete_original=False):
             await self._on_recover_message(message)
 
+    def _distribute_poll_buttons(self, texts: Sequence[str]) -> list[list[str]]:
+        pass
+
+    async def _on_poll(self, message: Message):
+        if message.chat.is_group and not self.is_bot_mentioned(message):
+            return
+
+        discarded_words = {*constants.KEYWORDS['poll'], self.name.lower(), f'<@{self.id}>'}
+        if final_options := [option.title() for option in message.text.split() if not flanautils.cartesian_product_string_matching(option.lower(), discarded_words, min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT)]:
+            await self.send('Encuesta en curso...', self._distribute_poll_buttons(final_options), message, buttons_key=ButtonsGroup.POLL, contents={'poll': {'is_active': True, 'votes': {option: [] for option in final_options}}})
+        else:
+            await self.send(random.choice(('¿Y las opciones?', '?', '🤔')), message)
+
+    async def _on_poll_button_press(self, message: Message):
+        await self._accept_button_event(message)
+        if not message.contents['poll']['is_active']:
+            return
+
+        option_name = results[0] if (results := re.findall('(.*?) ➜.+', message.buttons_info.pressed_text)) else message.buttons_info.pressed_text
+        selected_option_votes = message.contents['poll']['votes'][option_name]
+        presser_id = message.buttons_info.presser_user.id
+        presser_name = message.buttons_info.presser_user.name.split('#')[0]
+        total_votes = sum(len(option_votes) for option_votes in message.contents['poll']['votes'].values())
+        if [presser_id, presser_name] in selected_option_votes:
+            selected_option_votes.remove([presser_id, presser_name])
+            total_votes -= 1
+        else:
+            for option_votes in message.contents['poll']['votes'].values():
+                try:
+                    option_votes.remove([presser_id, presser_name])
+                except ValueError:
+                    pass
+                else:
+                    total_votes -= 1
+                    break
+            selected_option_votes.append((presser_id, presser_name))
+            total_votes += 1
+
+        if total_votes:
+            buttons = []
+            for option, option_votes in message.contents['poll']['votes'].items():
+                percent = f'{round(len(option_votes) / total_votes * 100)}%'
+                names = f"({', '.join(option_vote[1] for option_vote in option_votes)})" if option_votes else ''
+                buttons.append(f'{option} ➜ {percent} {names}')
+        else:
+            buttons = list(message.contents['poll']['votes'].keys())
+
+        await self.edit(self._distribute_poll_buttons(buttons), message)
+
     @bot_mentioned
     @group
     @admin(send_negative=True)
@@ -460,14 +500,18 @@ class FlanaBot(MultiBot, ABC):
     @inline(False)
     async def _on_recover_message(self, message: Message):
         if message.replied_message:
-            message_deleted_bot_action = BotAction.find_one({'action': bytes(Action.MESSAGE_DELETED), 'chat': message.chat.object_id, 'affected_objects': message.replied_message.object_id})
+            message_deleted_bot_action = BotAction.find_one({'action': Action.MESSAGE_DELETED.value, 'chat': message.chat.object_id, 'affected_objects': message.replied_message.object_id})
         elif self.is_bot_mentioned(message):
-            message_deleted_bot_action = BotAction.find_one({'action': bytes(Action.MESSAGE_DELETED), 'chat': message.chat.object_id, 'date': {'$gt': datetime.datetime.now(datetime.timezone.utc) - constants.RECOVERY_DELETED_MESSAGE_BEFORE}})
+            message_deleted_bot_action = BotAction.find_one({
+                'action': Action.MESSAGE_DELETED.value,
+                'chat': message.chat.object_id,
+                'date': {'$gt': datetime.datetime.now(datetime.timezone.utc) - constants.RECOVERY_DELETED_MESSAGE_BEFORE}
+            }, sort_keys=(('date', pymongo.DESCENDING),))
         else:
             return
 
         if not message_deleted_bot_action:
-            await self.send_error(random.choice(constants.RECOVER_PHRASES), message)
+            await self.send_error('No hay nada que recuperar.', message)
             return
 
         affected_object_ids = [affected_message_object_id for affected_message_object_id in message_deleted_bot_action.affected_objects]
@@ -475,10 +519,12 @@ class FlanaBot(MultiBot, ABC):
         for deleted_message in deleted_messages:
             await self.send(deleted_message.text, message)
 
-        message_deleted_bot_action.delete()
-
     async def _on_scraping(self, message: Message, delete_original: bool = None) -> OrderedSet[Media]:
-        sended_media_messages = await self._search_and_send_medias(message.replied_message) if message.replied_message else OrderedSet()
+        sended_media_messages = OrderedSet()
+        if message.replied_message:
+            word_matches = flanautils.cartesian_product_string_matching(message.text, constants.KEYWORDS['scraping'], min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT)
+            if sum(max(matches.values()) for matches in word_matches.values()):
+                sended_media_messages += await self._search_and_send_medias(message.replied_message)
         sended_media_messages += await self._search_and_send_medias(message)
         await self.send_inline_results(message)
 
@@ -491,6 +537,8 @@ class FlanaBot(MultiBot, ABC):
                         (
                                 delete_original is None
                                 and
+                                not message.replied_message
+                                and
                                 message.chat.config['auto_delete_original']
                         )
                         or
@@ -538,9 +586,48 @@ class FlanaBot(MultiBot, ABC):
         if song_infos:
             for song_info in song_infos:
                 await self.send_song_info(song_info, message)
-        elif self.is_bot_mentioned(message) or not message.chat.is_group:
+        elif self.is_bot_mentioned(message) or message.chat.is_private:
             await self._manage_exceptions(SendError('No hay información musical en ese mensaje.'), message)
 
+    async def _on_stop_poll(self, message: Message):
+        if poll_message := message.replied_message:
+            if poll_message.contents.get('poll') is None:
+                return
+        elif (
+                (message.chat.is_private or self.is_bot_mentioned(message))
+                and
+                flanautils.cartesian_product_string_matching(message.text, constants.KEYWORDS['poll'], min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT)
+                and
+                (poll_message := Message.find_one({'contents.poll.is_active': True}, sort_keys=(('date', pymongo.DESCENDING),)))
+        ):
+            poll_message = await self.get_message(poll_message.chat.id, poll_message.id)
+        else:
+            return
+
+        winners = []
+        max_votes = 1
+        for option, votes in poll_message.contents['poll']['votes'].items():
+            if len(votes) > max_votes:
+                winners = [option]
+                max_votes = len(votes)
+            elif len(votes) == max_votes:
+                winners.append(option)
+
+        match winners:
+            case [_, _, *_]:
+                winners = [f'<b>{winner}</b>' for winner in winners]
+                text = f"Encuesta finalizada. Los ganadores son: {flanautils.join_last_separator(winners, ', ', ' y ')}."
+            case [winner]:
+                text = f'Encuesta finalizada. Ganador: <b>{winner}</b>.'
+            case _:
+                text = 'Encuesta finalizada.'
+
+        poll_message.contents['poll']['is_active'] = False
+
+        await self.edit(text, poll_message)
+        if not message.replied_message:
+            await self.send(text, reply_to=poll_message)
+
     @group
     @bot_mentioned
     @admin(send_negative=True)
@@ -548,6 +635,33 @@ class FlanaBot(MultiBot, ABC):
         for user in await self._find_users_to_punish(message):
             await self.unpunish(user, message, message)
 
+    async def _on_weather_button_press(self, message: Message):
+        await self._accept_button_event(message)
+
+        match message.buttons_info.pressed_text:
+            case WeatherEmoji.ZOOM_IN.value:
+                message.weather_chart.zoom_in()
+            case WeatherEmoji.ZOOM_OUT.value:
+                message.weather_chart.zoom_out()
+            case WeatherEmoji.LEFT.value:
+                message.weather_chart.move_left()
+            case WeatherEmoji.RIGHT.value:
+                message.weather_chart.move_right()
+            case WeatherEmoji.PRECIPITATION_VOLUME.value:
+                message.weather_chart.trace_metadatas['rain_volume'].show = not message.weather_chart.trace_metadatas['rain_volume'].show
+                message.weather_chart.trace_metadatas['snow_volume'].show = not message.weather_chart.trace_metadatas['snow_volume'].show
+            case emoji if emoji in WeatherEmoji.values:
+                trace_metadata_name = WeatherEmoji(emoji).name.lower()
+                message.weather_chart.trace_metadatas[trace_metadata_name].show = not message.weather_chart.trace_metadatas[trace_metadata_name].show
+            case _:
+                return
+
+        message.weather_chart.apply_zoom()
+        message.weather_chart.draw()
+
+        image_bytes = message.weather_chart.to_image()
+        await self.edit(Media(image_bytes, MediaType.IMAGE), message)
+
     async def _on_weather_chart(self, message: Message):
         bot_state_message: Message | None = None
         if message.is_inline:
@@ -568,8 +682,9 @@ class FlanaBot(MultiBot, ABC):
             possible_mentioned_ids.append(user.name.split('#')[0].lower())
             possible_mentioned_ids.append(f'@{user.id}')
 
-        for role in await self.get_group_roles(message):
-            possible_mentioned_ids.append(f'@{role.id}')
+        if roles := await self.get_roles(message):
+            for role in roles:
+                possible_mentioned_ids.append(f'@{role.id}')
 
         original_text_words = flanautils.remove_accents(message.text.lower())
         original_text_words = original_text_words.replace(',', ' ').replace(';', ' ').replace('-', ' -')
@@ -676,6 +791,7 @@ class FlanaBot(MultiBot, ABC):
                 [WeatherEmoji.HUMIDITY.value, WeatherEmoji.PRECIPITATION_PROBABILITY.value, WeatherEmoji.PRECIPITATION_VOLUME.value, WeatherEmoji.PRESSURE.value, WeatherEmoji.WIND_SPEED.value]
             ],
             message,
+            buttons_key=ButtonsGroup.WEATHER,
             send_as_file=False
         )
         await self.send_inline_results(message)
@@ -757,10 +873,7 @@ class FlanaBot(MultiBot, ABC):
                 message.song_infos.add(media.song_info)
                 message.save()
 
-            try:
-                bot_message = await self.send(media, message)
-            except SendError as e:
-                await self._manage_exceptions(e, message)
+            if not (bot_message := await self.send(media, message)):
                 fails += 1
             else:
                 sended_media_messages.append(bot_message)

flanabot/bots/flana_disc_bot.py

@@ -1,8 +1,12 @@
+__all__ = ['FlanaDiscBot']
+
 import asyncio
 import os
+from typing import Sequence
 
 import discord
-from multibot import BadRoleError, DiscordBot, User
+import flanautils
+from multibot import BadRoleError, DiscordBot, User, constants as multibot_constants
 
 from flanabot import constants
 from flanabot.bots.flana_bot import FlanaBot
@@ -29,7 +33,7 @@ HOT_CHANNEL_ID = 493530483045564417
 # ---------------------------------------------------------------------------------------------------- #
 class FlanaDiscBot(DiscordBot, FlanaBot):
     def __init__(self):
-        super().__init__(os.environ['DISCORD_BOT_TOKEN2'])
+        super().__init__(os.environ['DISCORD_BOT_TOKEN'])
         self.heating = False
         self.heat_level = 0
 
@@ -40,6 +44,13 @@ class FlanaDiscBot(DiscordBot, FlanaBot):
         super()._add_handlers()
         self.client.add_listener(self._on_voice_state_update, 'on_voice_state_update')
 
+    # noinspection PyTypeChecker
+    def _distribute_poll_buttons(self, texts: Sequence[str]) -> list[list[str]]:
+        if len(texts) <= multibot_constants.DISCORD_BUTTONS_MAX:
+            return flanautils.chunks(texts, 1)
+        else:
+            return flanautils.chunks(texts, multibot_constants.DISCORD_BUTTONS_MAX)
+
     async def _heat_channel(self, channel: discord.VoiceChannel):
         while True:
             await asyncio.sleep(constants.HEAT_PERIOD_SECONDS)

flanabot/bots/flana_tele_bot.py

@@ -1,9 +1,12 @@
 from __future__ import annotations  # todo0 remove in 3.11
 
+__all__ = ['whitelisted_event', 'FlanaTeleBot']
+
 import functools
 import os
-from typing import Callable
+from typing import Callable, Sequence
 
+import flanautils
 import telethon.tl.functions
 from multibot import TelegramBot, find_message, user_client
 
@@ -36,7 +39,7 @@ class FlanaTeleBot(TelegramBot, FlanaBot):
         super().__init__(
             api_id=os.environ['TELEGRAM_API_ID'],
             api_hash=os.environ['TELEGRAM_API_HASH'],
-            bot_session=os.environ['TELEGRAM_BOT_SESSION2'],
+            bot_session=os.environ['TELEGRAM_BOT_SESSION'],
             user_session=os.environ['TELEGRAM_USER_SESSION']
         )
         self.whitelist_ids = []
@@ -44,6 +47,10 @@ class FlanaTeleBot(TelegramBot, FlanaBot):
     # ----------------------------------------------------------- #
     # -------------------- PROTECTED METHODS -------------------- #
     # ----------------------------------------------------------- #
+    def _distribute_poll_buttons(self, texts: Sequence[str]) -> list[list[str]]:
+        # noinspection PyTypeChecker
+        return flanautils.chunks(texts, 1)
+
     @user_client
     async def _get_contacts_ids(self) -> list[int]:
         async with self.user_client:

flanabot/constants.py

@@ -4,6 +4,8 @@ import flanautils
 
 AUTO_WEATHER_EVERY = datetime.timedelta(hours=6)
 CHECK_PUNISHMENTS_EVERY_SECONDS = datetime.timedelta(hours=1).total_seconds()
+FLOOD_2s_LIMIT = 4
+FLOOD_7s_LIMIT = 7
 HEAT_PERIOD_SECONDS = datetime.timedelta(minutes=15).total_seconds()
 INSULT_PROBABILITY = 0.00166666667
 MAX_PLACE_QUERY_LENGTH = 50
@@ -19,43 +21,84 @@ BYE_PHRASES = ('Adiós.', 'adieu', 'adio', 'adioh', 'adios', 'adió', 'adiós',
 HELLO_PHRASES = ('alo', 'aloh', 'buenas', 'Hola.', 'hello', 'hey', 'hi', 'hola', 'holaaaa', 'holaaaaaaa', 'ola',
                  'ola k ase', 'pa ti mi cola', 'saludos')
 INSULTS = (
-    'Cállate ya anda.',
-    '¿Quién te ha preguntado?',
-    '¿Tú eres así o te dan apagones cerebrales?',
+    '._.',
+    'aha',
+    'Aléjate de mi.',
     'Ante la duda mi dedo corazón te saluda.',
-    'Enjoy cancer brain.',
-    'Calla noob.',
-    'Hablas tanta mierda que tu culo tiene envidia de tu boca.',
-    'jAJjajAJjajAJjajAJajJAJajJA',
-    'enjoy xd',
-    'Reported.',
     'Baneito pa ti en breve.',
-    'Despídete de tu cuenta.',
-    'Flanagan es más guapo que tú.',
-    'jajaj',
-    'xd',
-    'Hay un concurso de hostias y tienes todas las papeletas.',
-    '¿Por qué no te callas?',
+    'Calla noob.',
+    'Cansino.',
+    'Cuentame menos.',
+    'Cuentame más.',
+    'Cállate ya anda.',
+    'Cállate.',
     'Das penilla.',
+    'De verdad. Estás para encerrarte.',
     'Deberían hacerte la táctica del C4.',
-    'Te voy romper las pelotas.',
-    'Más tonto y no naces.',
+    'Despídete de tu cuenta.',
+    'Déjame tranquilo.',
+    'Enjoy cancer brain.',
+    'Eres cortito, ¿eh?',
+    'Eres más malo que pegarle a un padre.',
     'Eres más tonto que peinar bombillas.',
     'Eres más tonto que pellizcar cristales.',
-    'Eres más malo que pegarle a un padre.'
+    'Estás mal de la azotea.',
+    'Estás mal de la cabeza.',
+    'Flanagan es más guapo que tú.',
+    'Hablas tanta mierda que tu culo tiene envidia de tu boca.',
+    'Hay un concurso de hostias y tienes todas las papeletas.',
+    'Loco.',
+    'Más tonto y no naces.',
+    'No eres muy avispado tú...',
+    'Pesado.',
+    'Que bien, ¿eh?',
+    'Que me dejes en paz.',
+    'Qué pesado.',
+    'Quita bicho.',
+    'Reportaito mi arma.',
+    'Reported.',
+    'Retard.',
+    'Te voy romper las pelotas.',
+    'Tú... no estás muy bien, ¿no?',
+    'Ya estamos otra vez...',
+    'Ya estamos...',
+    'enjoy xd',
+    'jAJjajAJjajAJjajAJajJAJajJA',
+    'jajaj',
+    'o_O',
+    'xd',
+    '¿Otra vez tú?',
+    '¿Pero cuándo te vas a callar?',
+    '¿Por qué no te callas?',
+    '¿Quién te ha preguntado?',
+    '¿Qúe quieres?',
+    '¿Te callas o te callo?',
+    '¿Te imaginas que me interesa?',
+    '¿Te quieres callar?',
+    '¿Todo bien?',
+    '¿Tú eres así o te dan apagones cerebrales?',
+    '🖕',
+    '😑',
+    '🙄',
+    '🤔',
+    '🤨'
 )
 
 KEYWORDS = {
+    'choose': ('choose', 'elige'),
     'covid_chart': ('case', 'caso', 'contagiado', 'contagio', 'corona', 'coronavirus', 'covid', 'covid19', 'death',
                     'disease', 'enfermedad', 'enfermos', 'fallecido', 'incidencia', 'jacovid', 'mascarilla', 'muerte',
                     'muerto', 'pandemia', 'sick', 'virus'),
     'currency_chart': ('argentina', 'bitcoin', 'cardano', 'cripto', 'crypto', 'criptodivisa', 'cryptodivisa',
                        'cryptomoneda', 'cryptocurrency', 'currency', 'dinero', 'divisa', 'ethereum', 'inversion',
                        'moneda', 'pasta'),
+    'dice': ('dado', 'dice'),
+    'poll': ('encuesta', 'poll', 'quiz'),
     'punish': ('acaba', 'aprende', 'ataca', 'atalo', 'azota', 'boss', 'castiga', 'castigo', 'condena', 'controla',
-               'destroy', 'destroza', 'duro', 'ejecuta', 'enseña', 'escarmiento', 'execute', 'finish', 'fuck', 'fusila',
-               'hell', 'humos', 'infierno', 'jefe', 'jode', 'learn', 'leccion', 'lesson', 'manda', 'purgatorio',
-               'sancion', 'shoot', 'teach', 'termina', 'whip'),
+               'destroy', 'destroza', 'duro', 'ejecuta', 'enseña', 'escarmiento', 'execute', 'fuck', 'fusila', 'hell',
+               'humos', 'infierno', 'jefe', 'jode', 'learn', 'leccion', 'lesson', 'manda', 'purgatorio', 'sancion',
+               'shoot', 'teach', 'whip'),
+    'random': ('aleatorio', 'azar', 'random'),
     'scraping': ('api', 'aqui', 'busca', 'contenido', 'content', 'descarga', 'descargar', 'download', 'envia', 'habia',
                  'media', 'redes', 'scrap', 'scraping', 'search', 'send', 'social', 'sociales', 'tenia', 'video',
                  'videos'),
@@ -71,14 +114,5 @@ KEYWORDS = {
                       'wetter')
 }
 
-RECOVER_PHRASES = (
-    'No hay nada que recuperar.',
-    'Ya lo he recuperado y enviado, así que callate ya.',
-    'Ya lo he recuperado y enviado, así que mejor estás antento antes de dar por culo.',
-    'Ya lo he recuperado y enviado, no lo voy a hacer dos veces.',
-    'Ya lo he recuperado y enviado. A ver si leemos más y jodemos menos.',
-    'Ya lo he reenviado.'
-)
-
 SCRAPING_PHRASES = ('Analizando...', 'Buscando...', 'Hackeando internet... 👀', 'Rebuscando en la web...',
                     'Robando cosas...', 'Scrapeando...', 'Scraping...')

flanabot/main.py

@@ -5,7 +5,6 @@ import flanautils
 os.environ |= flanautils.find_environment_variables('../.env')
 
 import asyncio
-
 from flanabot.bots.flana_disc_bot import FlanaDiscBot
 from flanabot.bots.flana_tele_bot import FlanaTeleBot
 

flanabot/models/__init__.py

@@ -1,5 +1,4 @@
 from flanabot.models.chat import *
-from flanabot.models.enums import *
 from flanabot.models.message import *
 from flanabot.models.punishment import *
 from flanabot.models.weather_chart import *

flanabot/models/chat.py

@@ -1,3 +1,5 @@
+__all__ = ['Chat']
+
 from dataclasses import dataclass
 
 from multibot.models import Chat as MultiBotChat

flanabot/models/enums.py

@@ -1,8 +0,0 @@
-from enum import auto
-
-from flanautils import FlanaEnum
-
-
-class ButtonsMessageType(FlanaEnum):
-    CONFIG = auto()
-    WEATHER = auto()

flanabot/models/message.py

@@ -1,5 +1,7 @@
 from __future__ import annotations  # todo0 remove in 3.11
 
+__all__ = ['Message']
+
 from dataclasses import dataclass, field
 from typing import Iterable
 
@@ -13,7 +15,6 @@ from flanabot.models.weather_chart import WeatherChart
 @dataclass(eq=False)
 class Message(MultiBotMessage):
     author: User = None
-    button_pressed_user: User = None
     mentions: Iterable[User] = field(default_factory=list)
     chat: Chat = None
     replied_message: Message = None

flanabot/models/weather_chart.py

@@ -1,3 +1,5 @@
+__all__ = ['Direction', 'WeatherChart']
+
 import datetime
 from dataclasses import dataclass, field
 

requirements.txt

@@ -1,9 +1,9 @@
-aiohttp==3.7.4.post0
+aiohttp==3.8.1
 aiosignal==1.2.0
 anyio==3.5.0
 asgiref==3.4.1
 async-generator==1.10
-async-timeout==3.0.1
+async-timeout==4.0.2
 attrs==21.4.0
 beautifulsoup4==4.10.0
 certifi==2021.10.8
@@ -14,7 +14,7 @@ click==8.0.3
 colorama==0.4.4
 cryptg==0.2.post4
 cryptography==36.0.1
-discord.py==2.0.0a4269+gb7e25645
+discord.py @ git+https://github.com/Rapptz/discord.py@b7e25645dc68bbb828bf1ede711d098c6b183237
 fastapi==0.71.0
 flanaapis
 flanautils
@@ -47,6 +47,7 @@ selenium-stealth==1.0.6
 six==1.16.0
 sniffio==1.2.0
 sortedcontainers==2.4.0
+soupsieve==2.3.1
 starlette==0.17.1
 sympy==1.9
 Telethon==1.24.0
@@ -54,7 +55,7 @@ tenacity==8.0.1
 TikTokApi==4.1.0
 trio==0.19.0
 trio-websocket==0.9.2
-twitchio==2.1.4
+twitchio==2.3.0
 typing_extensions==4.0.1
 ujson==5.1.0
 urllib3==1.26.8

tests/unit/test_parse_callbacks.py

@@ -7,7 +7,6 @@ os.environ |= flanautils.find_environment_variables('../.env')
 import unittest
 from typing import Iterable
 
-from multibot import constants as multibot_constants
 from flanabot.bots.flana_tele_bot import FlanaTeleBot
 
 
@@ -15,7 +14,7 @@ class TestParseCallbacks(unittest.TestCase):
     def _test_no_always_callbacks(self, phrases: Iterable[str], callback: callable):
         for i, phrase in enumerate(phrases):
             with self.subTest(phrase):
-                callbacks = [registered_callback.callback for registered_callback in self.flana_tele_bot._parse_callbacks(phrase, multibot_constants.RATIO_REWARD_EXPONENT, multibot_constants.KEYWORDS_LENGHT_PENALTY, multibot_constants.MINIMUM_RATIO_TO_MATCH)
+                callbacks = [registered_callback.callback for registered_callback in self.flana_tele_bot._parse_callbacks(phrase, self.flana_tele_bot._registered_callbacks)
                              if not registered_callback.always]
                 self.assertEqual(1, len(callbacks))
                 self.assertEqual(callback, callbacks[0], f'\n\nExpected: {callback.__name__}\nActual:   {callbacks[0].__name__}')
@@ -92,8 +91,7 @@ class TestParseCallbacks(unittest.TestCase):
     def test_on_delete_original_config_activate(self):
         phrases = [
             'activa el borrado automatico',
-            'flanabot pon el auto delete activado',
-            'flanabot activa el autodelete'
+            'flanabot pon el auto delete activado'
         ]
         self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_delete_original_config_activate)
 
@@ -104,8 +102,7 @@ class TestParseCallbacks(unittest.TestCase):
     def test_on_delete_original_config_deactivate(self):
         phrases = [
             'desactiva el borrado automatico',
-            'flanabot pon el auto delete desactivado',
-            'flanabot desactiva el autodelete'
+            'flanabot pon el auto delete desactivado'
         ]
         self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_delete_original_config_deactivate)
 
@@ -119,9 +116,9 @@ class TestParseCallbacks(unittest.TestCase):
 
     def test_on_mute(self):
         phrases = [
-            # 'silencia',
-            # 'silencia al pavo ese',
-            # 'calla a ese pesao',
+            'silencia',
+            'silencia al pavo ese',
+            'calla a ese pesao',
             'haz que se calle',
             'quitale el microfono a ese',
             'quitale el micro',