Fix recover original message

flanabot/bots/flana_bot.py

@@ -1,3 +1,5 @@
+__all__ = ['FlanaBot']
+
 import asyncio
 import datetime
 import random
@@ -10,6 +12,7 @@ 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
@@ -146,14 +149,14 @@ class FlanaBot(MultiBot, ABC):
             return
 
         last_2s_messages = Message.find({
-            'platform': self.bot_platform.value,
+            'platform': self.platform.value,
             'author': message.author.object_id,
             'last_update': {
                 '$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=2)
             }
         })
         last_7s_messages = Message.find({
-            'platform': self.bot_platform.value,
+            'platform': self.platform.value,
             'author': message.author.object_id,
             'last_update': {
                 '$gte': datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=7),
@@ -163,7 +166,7 @@ class FlanaBot(MultiBot, ABC):
 
         if len(last_2s_messages) >= 5 or len(last_7s_messages) >= 7:
             n_punishments = len(Punishment.find({
-                'platform': self.bot_platform.value,
+                'platform': self.platform.value,
                 'user_id': message.author.id,
                 'group_id': message.chat.group_id
             }))
@@ -175,23 +178,6 @@ class FlanaBot(MultiBot, ABC):
             else:
                 await self.send(f'Castigado durante {TimeUnits(seconds=punishment_seconds).to_words()}.', message)
 
-    async def _check_punishments(self):
-        punishment_groups = self._get_grouped_punishments(Punishment)
-
-        now = datetime.datetime.now(datetime.timezone.utc)
-        for (user_id, group_id), sorted_punishments in punishment_groups:
-            if now < (last_punishment := sorted_punishments[-1]).until:
-                continue
-
-            if last_punishment.until + constants.PUNISHMENTS_RESET <= now:
-                for old_punishment in sorted_punishments:
-                    old_punishment.delete()
-
-            if last_punishment.is_active:
-                await self.unpunish(user_id, group_id)
-                last_punishment.is_active = False
-                last_punishment.save()
-
     @staticmethod
     def _get_config_buttons(config: dict | Chat | Message) -> list[list[str]]:
         match config:
@@ -201,6 +187,7 @@ class FlanaBot(MultiBot, ABC):
                 config = message.chat.config
 
         buttons_texts = [f"{'✔' if v else '❌'}  {k}" for k, v in config.items()]
+        # noinspection PyTypeChecker
         return flanautils.chunks(buttons_texts, 3)
 
     @return_if_first_empty(exclude_self_types='FlanaBot', globals_=globals())
@@ -261,7 +248,7 @@ class FlanaBot(MultiBot, ABC):
         new_line = ' ' if len(medias_sended_info) == 1 else '\n'
         return f'{new_line}{medias_sended_info_joined}:'
 
-    async def _punish(self, user: int | str | User, group_: int | str | Chat):
+    async def _punish(self, user: int | str | User, group_: int | str | Chat | Message, message: Message = None):
         pass
 
     async def _search_and_send_medias(self, message: Message, send_song_info=False) -> list[Message]:
@@ -303,7 +290,7 @@ class FlanaBot(MultiBot, ABC):
     async def _show_config(self, config_name: str, message: Message):
         await self.send(f"{config_name} está {'activado ✔' if message.chat.config.get(config_name) else 'desactivado ❌'}", message)
 
-    async def _unpunish(self, user: int | str | User, group_: int | str | Chat):
+    async def _unpunish(self, user: int | str | User, group_: int | str | Chat | Message, message: Message = None):
         pass
 
     # ---------------------------------------------- #
@@ -311,8 +298,6 @@ class FlanaBot(MultiBot, ABC):
     # ---------------------------------------------- #
     async def _on_button_press(self, message: Message):
         await self._accept_button_event(message)
-        if not message.button_pressed_user.is_admin:
-            return
 
         match message.button_pressed_text:
             case WeatherEmoji.ZOOM_IN.value:
@@ -335,13 +320,13 @@ class FlanaBot(MultiBot, ABC):
                 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 'auto_' in (config := message.button_pressed_text.split()[1]):
+            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 _:
-                buttons_message_type = None
+                return
 
         if buttons_message_type is ButtonsMessageType.WEATHER:
             message.weather_chart.apply_zoom()
@@ -469,32 +454,35 @@ class FlanaBot(MultiBot, ABC):
     @group
     @admin(send_negative=True)
     async def _on_punish(self, message: Message):
-        await self._update_punishment(self.punish, message, time=flanautils.words_to_time(message.text))
+        for user in await self._find_users_to_punish(message):
+            await self.punish(user, message, flanautils.words_to_time(message.text), message)
 
     async def _on_ready(self):
         await super()._on_ready()
-        await flanautils.do_every(constants.CHECK_PUNISHMENTS_EVERY_SECONDS, self._check_punishments)
+        await flanautils.do_every(constants.CHECK_PUNISHMENTS_EVERY_SECONDS, Punishment.check_olds, self._unpunish, self.platform)
 
     @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]
-        deleted_messages: list[Message] = [affected_message for affected_object_id in affected_object_ids if (affected_message := Message.find_one({'platform': self.bot_platform.value, '_id': affected_object_id})).author.id != self.bot_id]
+        deleted_messages: list[Message] = [affected_message for affected_object_id in affected_object_ids if (affected_message := Message.find_one({'platform': self.platform.value, '_id': affected_object_id})).author.id != self.id]
         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 += await self._search_and_send_medias(message)
@@ -563,7 +551,8 @@ class FlanaBot(MultiBot, ABC):
     @bot_mentioned
     @admin(send_negative=True)
     async def _on_unpunish(self, message: Message):
-        await self._update_punishment(self.unpunish, message)
+        for user in await self._find_users_to_punish(message):
+            await self.unpunish(user, message, message)
 
     async def _on_weather_chart(self, message: Message):
         bot_state_message: Message | None = None
@@ -571,7 +560,7 @@ class FlanaBot(MultiBot, ABC):
             show_progress_state = False
         elif message.chat.is_group and not self.is_bot_mentioned(message):
             if message.chat.config['auto_weather_chart']:
-                if BotAction.find_one({'action': bytes(Action.AUTO_WEATHER_CHART), 'chat': message.chat.object_id, 'date': {'$gt': datetime.datetime.now(datetime.timezone.utc) - constants.AUTO_WEATHER_EVERY}}):
+                if BotAction.find_one({'action': Action.AUTO_WEATHER_CHART.value, 'chat': message.chat.object_id, 'date': {'$gt': datetime.datetime.now(datetime.timezone.utc) - constants.AUTO_WEATHER_EVERY}}):
                     return
                 show_progress_state = False
             else:
@@ -584,7 +573,9 @@ class FlanaBot(MultiBot, ABC):
             possible_mentioned_ids.append(user.name.lower())
             possible_mentioned_ids.append(user.name.split('#')[0].lower())
             possible_mentioned_ids.append(f'@{user.id}')
-        for role in message.chat.roles:
+
+        if roles := await self.get_group_roles(message):
+            for role in roles:
                 possible_mentioned_ids.append(f'@{role.id}')
 
         original_text_words = flanautils.remove_accents(message.text.lower())
@@ -733,31 +724,13 @@ class FlanaBot(MultiBot, ABC):
     # -------------------------------------------------------- #
     # -------------------- PUBLIC METHODS -------------------- #
     # -------------------------------------------------------- #
-    async def is_punished(self, user: int | str | User, group_: int | str | Chat) -> bool:
+    async def is_punished(self, user: int | str | User, group_: int | str | Chat | Message) -> bool:
         pass
 
-    async def punish(self, user: int | str | User, group_: int | str | Chat, time: int | datetime.timedelta, message: Message = None):
-        user_id = self._get_user_id(user)
-        group_id = self._get_group_id(group_)
-        if isinstance(time, int):
-            time = datetime.timedelta(seconds=time)
-
-        try:
-            await self._punish(user_id, group_id)
-        except BadRoleError as e:
-            if message and message.chat.original_object:
-                await self._manage_exceptions(e, message)
-            else:
-                raise e
-        else:
-            if time:
-                until = datetime.datetime.now(datetime.timezone.utc) + time
-                if datetime.timedelta() < time <= constants.TIME_THRESHOLD_TO_MANUAL_UNPUNISH:
-                    await flanautils.do_later(time, self._check_punishments)
-            else:
-                until = None
+    async def punish(self, user: int | str | User, group_: int | str | Chat | Message, time: int | datetime.timedelta, message: Message = None):
         # noinspection PyTypeChecker
-            Punishment(self.bot_platform, user_id, group_id, until=until).save()
+        punish = Punishment(self.platform, self.get_user_id(user), self.get_group_id(group_), time)
+        await punish.punish(self._punish, self._unpunish, message)
 
     async def send_bye(self, message: Message) -> multibot_constants.ORIGINAL_MESSAGE:
         return await self.send(random.choice((*constants.BYE_PHRASES, flanautils.CommonWords.random_time_greeting())), message)
@@ -791,10 +764,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)
@@ -825,18 +795,7 @@ class FlanaBot(MultiBot, ABC):
         if song_info:
             await self.send(song_info, message)
 
-    async def unpunish(self, user: int | str | User, group_: int | str | Chat, message: Message = None):
-        user_id = self._get_user_id(user)
-        group_id = self._get_group_id(group_)
-        try:
-            await self._unpunish(user_id, group_id)
-        except BadRoleError as e:
-            if message and message.chat.original_object:
-                await self._manage_exceptions(e, message)
-            else:
-                raise e
-        else:
-            try:
-                Punishment.find_one({'platform': self.bot_platform.value, 'user_id': user_id, 'group_id': group_id, 'until': None}).delete()
-            except AttributeError:
-                pass
+    async def unpunish(self, user: int | str | User, group_: int | str | Chat | Message, message: Message = None):
+        # noinspection PyTypeChecker
+        punish = Punishment(self.platform, self.get_user_id(user), self.get_group_id(group_))
+        await punish.unpunish(self._unpunish, message)

flanabot/bots/flana_disc_bot.py

@@ -1,3 +1,5 @@
+__all__ = ['FlanaDiscBot']
+
 import asyncio
 import os
 
@@ -6,7 +8,7 @@ from multibot import BadRoleError, DiscordBot, User
 
 from flanabot import constants
 from flanabot.bots.flana_bot import FlanaBot
-from flanabot.models import Chat, Punishment
+from flanabot.models import Chat, Message, Punishment
 
 HEAT_NAMES = [
     'Canal Congelado',
@@ -38,7 +40,7 @@ class FlanaDiscBot(DiscordBot, FlanaBot):
     # ----------------------------------------------------------- #
     def _add_handlers(self):
         super()._add_handlers()
-        self.bot_client.add_listener(self._on_voice_state_update, 'on_voice_state_update')
+        self.client.add_listener(self._on_voice_state_update, 'on_voice_state_update')
 
     async def _heat_channel(self, channel: discord.VoiceChannel):
         while True:
@@ -57,16 +59,16 @@ class FlanaDiscBot(DiscordBot, FlanaBot):
 
             await channel.edit(name=HEAT_NAMES[int(self.heat_level)])
 
-    async def _punish(self, user: int | str | User, group_: int | str | Chat):
-        user_id = self._get_user_id(user)
+    async def _punish(self, user: int | str | User, group_: int | str | Chat | Message, message: Message = None):
+        user_id = self.get_user_id(user)
         try:
             await self.add_role(user_id, group_, 'Castigado')
             await self.remove_role(user_id, group_, 'Persona')
         except AttributeError:
             raise BadRoleError(str(self._punish))
 
-    async def _unpunish(self, user: int | str | User, group_: int | str | Chat):
-        user_id = self._get_user_id(user)
+    async def _unpunish(self, user: int | str | User, group_: int | str | Chat | Message, message: Message = None):
+        user_id = self.get_user_id(user)
         try:
             await self.add_role(user_id, group_, 'Persona')
             await self.remove_role(user_id, group_, 'Castigado')
@@ -92,11 +94,11 @@ class FlanaDiscBot(DiscordBot, FlanaBot):
     # -------------------------------------------------------- #
     # -------------------- PUBLIC METHODS -------------------- #
     # -------------------------------------------------------- #
-    async def is_punished(self, user: int | str | User, group_: int | str | Chat):
+    async def is_punished(self, user: int | str | User, group_: int | str | Chat | Message):
         user = await self.get_user(user, group_)
-        group_id = self._get_group_id(group_)
+        group_id = self.get_group_id(group_)
         return group_id in {punishment.group_id for punishment in Punishment.find({
-            'platform': self.bot_platform.value,
+            'platform': self.platform.value,
             'user_id': user.id,
             'group_id': group_id,
             'is_active': True

flanabot/bots/flana_tele_bot.py

@@ -1,5 +1,7 @@
 from __future__ import annotations  # todo0 remove in 3.11
 
+__all__ = ['whitelisted_event', 'FlanaTeleBot']
+
 import functools
 import os
 from typing import Callable
@@ -53,7 +55,7 @@ class FlanaTeleBot(TelegramBot, FlanaBot):
 
     @user_client
     async def _update_whitelist(self):
-        self.whitelist_ids = [self.owner_id, self.bot_id] + await self._get_contacts_ids()
+        self.whitelist_ids = [self.owner_id, self.id] + await self._get_contacts_ids()
 
     # ---------------------------------------------- #
     #                    HANDLERS                    #

flanabot/constants.py

@@ -10,7 +10,6 @@ MAX_PLACE_QUERY_LENGTH = 50
 PUNISHMENT_INCREMENT_EXPONENT = 6
 PUNISHMENTS_RESET = datetime.timedelta(weeks=6 * flanautils.WEEKS_IN_A_MONTH)
 RECOVERY_DELETED_MESSAGE_BEFORE = datetime.timedelta(hours=1)
-TIME_THRESHOLD_TO_MANUAL_UNPUNISH = datetime.timedelta(days=3)
 SCRAPING_MESSAGE_WAITING_TIME = 0.1
 
 BYE_PHRASES = ('Adiós.', 'adieu', 'adio', 'adioh', 'adios', 'adió', 'adiós', 'agur', 'bye', 'byyeeee', 'chao',
@@ -72,14 +71,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,7 @@ import flanautils
 os.environ |= flanautils.find_environment_variables('../.env')
 
 import asyncio
-
+from multibot import TwitchBot
 from flanabot.bots.flana_disc_bot import FlanaDiscBot
 from flanabot.bots.flana_tele_bot import FlanaTeleBot
 
@@ -13,10 +13,24 @@ from flanabot.bots.flana_tele_bot import FlanaTeleBot
 async def main():
     flana_disc_bot = FlanaDiscBot()
     flana_tele_bot = FlanaTeleBot()
+    t = TwitchBot(
+        bot_token=os.environ['TWITCH_ACCESS_TOKEN'],
+        initial_channels=['flanaganvaquero'],
+        owner_name='flanaganvaquero'
+    )
+
+    @t.register(always=True)
+    async def asd(message):
+        await t.send('@flanaganvaquero adios', message, reply_to=message)
+        # await message.chat.original_object._ws.reply(message.id, f"PRIVMSG #{message.author.name.lower()} :awdwhkajwd\r\n")
+        # await message.original_object.channel.reply('asd')
+        # m = await t.send('hola', message, reply_to=message.id)
+        # await t.send('me respondo a mi mismo', message, reply_to=m)
 
     await asyncio.gather(
         flana_disc_bot.start(),
-        flana_tele_bot.start()
+        flana_tele_bot.start(),
+        t.start()
     )
 
 

flanabot/models/chat.py

@@ -1,6 +1,8 @@
-from dataclasses import dataclass, field
+__all__ = ['Chat']
 
-from multibot.models import Chat as MultiBotChat, User
+from dataclasses import dataclass
+
+from multibot.models import Chat as MultiBotChat
 
 
 @dataclass(eq=False)
@@ -11,7 +13,6 @@ class Chat(MultiBotChat):
                       'auto_insult': True,
                       'auto_scraping': True,
                       'auto_weather_chart': True}
-    users: list[User] = field(default_factory=list)
 
     def __post_init__(self):
         super().__post_init__()

flanabot/models/enums.py

@@ -1,3 +1,5 @@
+__all__ = ['ButtonsMessageType']
+
 from enum import auto
 
 from flanautils import FlanaEnum

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
 

flanabot/models/punishment.py

@@ -1,8 +1,32 @@
-from dataclasses import dataclass
+__all__ = ['Punishment']
 
-from multibot.models import Mute, db
+import datetime
+from dataclasses import dataclass
+from typing import Callable
+
+from multibot.models import Platform, PunishmentBase, db
+
+from flanabot import constants
 
 
 @dataclass(eq=False)
-class Punishment(Mute):
+class Punishment(PunishmentBase):
     collection = db.punishment
+
+    @classmethod
+    async def check_olds(cls, unpunishment_method: Callable, platform: Platform):
+        punishment_groups = cls._get_grouped_punishments(platform)
+
+        now = datetime.datetime.now(datetime.timezone.utc)
+        for (_, _), sorted_punishments in punishment_groups:
+            if not (last_punishment := sorted_punishments[-1]).until or now < last_punishment.until:
+                continue
+
+            if last_punishment.until + constants.PUNISHMENTS_RESET <= now:
+                for old_punishment in sorted_punishments:
+                    old_punishment.delete()
+
+            if last_punishment.is_active:
+                await last_punishment.unpunish(unpunishment_method)
+                last_punishment.is_active = False
+                last_punishment.save()

flanabot/models/weather_chart.py

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

requirements.txt

@@ -54,7 +54,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