Fix _check_message_flood

flanabot/bots/flana_bot.py

@@ -152,20 +152,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,
@@ -308,7 +303,7 @@ class FlanaBot(MultiBot, ABC):
             return
 
         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)
 
     @group
@@ -548,7 +543,6 @@ class FlanaBot(MultiBot, ABC):
 
         message.weather_chart.apply_zoom()
         message.weather_chart.draw()
-        message.save()
 
         image_bytes = message.weather_chart.to_image()
         await self.edit(Media(image_bytes, MediaType.IMAGE), message)

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
@@ -20,6 +22,7 @@ HELLO_PHRASES = ('alo', 'aloh', 'buenas', 'Hola.', 'hello', 'hey', 'hi', 'hola',
                  'ola k ase', 'pa ti mi cola', 'saludos')
 INSULTS = (
     '._.',
+    'aha',
     'Aléjate de mi.',
     'Ante la duda mi dedo corazón te saluda.',
     'Baneito pa ti en breve.',
@@ -47,7 +50,7 @@ INSULTS = (
     'Loco.',
     'Más tonto y no naces.',
     'No eres muy avispado tú...',
-    'Pesado',
+    'Pesado.',
     'Que bien, ¿eh?',
     'Que me dejes en paz.',
     'Qué pesado.',
@@ -70,7 +73,7 @@ INSULTS = (
     '¿Quién te ha preguntado?',
     '¿Qúe quieres?',
     '¿Te callas o te callo?',
-    '¿Te imaginas que me interesa?aha',
+    '¿Te imaginas que me interesa?',
     '¿Te quieres callar?',
     '¿Todo bien?',
     '¿Tú eres así o te dan apagones cerebrales?',

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',