From 082ae6733b0d4f01e90a05855192d7ed455d4b99 Mon Sep 17 00:00:00 2001 From: AlberLC Date: Tue, 25 Oct 2022 09:42:03 +0200 Subject: [PATCH] Delete useless code --- flanabot/bots/flana_bot.py | 183 +---------------------------- tests/unit/test_parse_callbacks.py | 104 +--------------- 2 files changed, 4 insertions(+), 283 deletions(-) diff --git a/flanabot/bots/flana_bot.py b/flanabot/bots/flana_bot.py index 10e4475..14f817e 100644 --- a/flanabot/bots/flana_bot.py +++ b/flanabot/bots/flana_bot.py @@ -41,47 +41,8 @@ class FlanaBot(MultiBot, ABC): self.register(self._on_choose, constants.KEYWORDS['random'], priority=2) self.register(self._on_choose, (constants.KEYWORDS['choose'], constants.KEYWORDS['random']), priority=2) - 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'])) - - self.register(self._on_covid_chart, constants.KEYWORDS['covid_chart']) - - self.register(self._on_currency_chart, constants.KEYWORDS['currency_chart']) - self.register(self._on_currency_chart, (multibot_constants.KEYWORDS['show'], constants.KEYWORDS['currency_chart'])) - - self.register(self._on_currency_chart_config_activate, (multibot_constants.KEYWORDS['activate'], constants.KEYWORDS['currency_chart'])) - self.register(self._on_currency_chart_config_activate, (multibot_constants.KEYWORDS['activate'], constants.KEYWORDS['currency_chart'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_currency_chart_config_change, (multibot_constants.KEYWORDS['change'], constants.KEYWORDS['currency_chart'])) - self.register(self._on_currency_chart_config_change, (multibot_constants.KEYWORDS['change'], constants.KEYWORDS['currency_chart'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_currency_chart_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['currency_chart'])) - self.register(self._on_currency_chart_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['currency_chart'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_currency_chart_config_show, (constants.KEYWORDS['currency_chart'], multibot_constants.KEYWORDS['config'])) - self.register(self._on_currency_chart_config_show, (multibot_constants.KEYWORDS['show'], constants.KEYWORDS['currency_chart'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_delete_original_config_activate, (multibot_constants.KEYWORDS['activate'], multibot_constants.KEYWORDS['delete'])) - self.register(self._on_delete_original_config_activate, (multibot_constants.KEYWORDS['activate'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message'])) - self.register(self._on_delete_original_config_activate, (multibot_constants.KEYWORDS['activate'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['config'])) - self.register(self._on_delete_original_config_activate, (multibot_constants.KEYWORDS['activate'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_delete_original_config_change, (multibot_constants.KEYWORDS['change'], multibot_constants.KEYWORDS['delete'])) - self.register(self._on_delete_original_config_change, (multibot_constants.KEYWORDS['change'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message'])) - self.register(self._on_delete_original_config_change, (multibot_constants.KEYWORDS['change'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['config'])) - self.register(self._on_delete_original_config_change, (multibot_constants.KEYWORDS['change'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_delete_original_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], multibot_constants.KEYWORDS['delete'])) - self.register(self._on_delete_original_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message'])) - self.register(self._on_delete_original_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['config'])) - self.register(self._on_delete_original_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], 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'])) - self.register(self._on_delete_original_config_show, (multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['config'])) - self.register(self._on_delete_original_config_show, (multibot_constants.KEYWORDS['show'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['message'])) - self.register(self._on_delete_original_config_show, (multibot_constants.KEYWORDS['show'], multibot_constants.KEYWORDS['delete'], multibot_constants.KEYWORDS['config'])) - 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_config, multibot_constants.KEYWORDS['config']) + self.register(self._on_config, (multibot_constants.KEYWORDS['show'], multibot_constants.KEYWORDS['config'])) self.register(self._on_dice, constants.KEYWORDS['dice']) @@ -117,19 +78,6 @@ class FlanaBot(MultiBot, ABC): self.register(self._on_scraping_audio, multibot_constants.KEYWORDS['audio']) self.register(self._on_scraping_audio, (multibot_constants.KEYWORDS['audio'], constants.KEYWORDS['scraping'])) - self.register(self._on_scraping_config_activate, (multibot_constants.KEYWORDS['activate'], constants.KEYWORDS['scraping'])) - self.register(self._on_scraping_config_activate, (multibot_constants.KEYWORDS['activate'], constants.KEYWORDS['scraping'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_scraping_config_change, (multibot_constants.KEYWORDS['change'], constants.KEYWORDS['scraping'])) - self.register(self._on_scraping_config_change, (multibot_constants.KEYWORDS['change'], constants.KEYWORDS['scraping'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_scraping_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['scraping'])) - self.register(self._on_scraping_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['scraping'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_scraping_config_show, (multibot_constants.KEYWORDS['show'], constants.KEYWORDS['scraping'])) - self.register(self._on_scraping_config_show, (constants.KEYWORDS['scraping'], multibot_constants.KEYWORDS['config'])) - self.register(self._on_scraping_config_show, (multibot_constants.KEYWORDS['show'], constants.KEYWORDS['scraping'], multibot_constants.KEYWORDS['config'])) - self.register(self._on_song_info, constants.KEYWORDS['song_info']) self.register(self._on_stop_poll, multibot_constants.KEYWORDS['deactivate']) @@ -138,39 +86,17 @@ class FlanaBot(MultiBot, ABC): 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'])) self.register(self._on_unpunish, (multibot_constants.KEYWORDS['activate'], multibot_constants.KEYWORDS['permission'])) self.register(self._on_weather_chart, constants.KEYWORDS['weather_chart']) self.register(self._on_weather_chart, (multibot_constants.KEYWORDS['show'], constants.KEYWORDS['weather_chart'])) - self.register(self._on_weather_chart_config_activate, (multibot_constants.KEYWORDS['activate'], constants.KEYWORDS['weather_chart'])) - self.register(self._on_weather_chart_config_activate, (multibot_constants.KEYWORDS['activate'], constants.KEYWORDS['weather_chart'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_weather_chart_config_change, (multibot_constants.KEYWORDS['change'], constants.KEYWORDS['weather_chart'])) - self.register(self._on_weather_chart_config_change, (multibot_constants.KEYWORDS['change'], constants.KEYWORDS['weather_chart'], multibot_constants.KEYWORDS['config'])) - - self.register(self._on_weather_chart_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['weather_chart'])) - self.register(self._on_weather_chart_config_deactivate, (multibot_constants.KEYWORDS['deactivate'], constants.KEYWORDS['weather_chart'], multibot_constants.KEYWORDS['config'])) - - 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_config_button_press, ButtonsGroup.CONFIG) self.register_button(self._on_poll_button_press, ButtonsGroup.POLL) self.register_button(self._on_roles_button_press, ButtonsGroup.ROLES) 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: - value = not message.chat.config[config_name] - - message.chat.config[config_name] = value - message.chat.save() - - await self.send(f"He {'activado ✔' if value else 'desactivado ❌'} {config_name}.", message) - async def _changeable_roles(self, group_: int | str | Chat | Message) -> list[Role]: pass @@ -369,9 +295,6 @@ class FlanaBot(MultiBot, ABC): return OrderedSet(*medias) - 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 | Message, message: Message = None): pass @@ -435,60 +358,6 @@ class FlanaBot(MultiBot, ABC): await self.delete_message(message) await self.send('Estos son los ajustes del chat:\n\n', flanautils.chunks(buttons_texts, 3), message, buttons_key=ButtonsGroup.CONFIG) - async def _on_covid_chart(self, message: Message): # todo2 - pass - - async def _on_currency_chart(self, message: Message): # todo2 - pass - - @admin - @group - @bot_mentioned - async def _on_currency_chart_config_activate(self, message: Message): - await self._change_config('auto_currency_chart', message, True) - - @admin - @group - @bot_mentioned - async def _on_currency_chart_config_change(self, message: Message): - await self._change_config('auto_currency_chart', message) - - @admin - @group - @bot_mentioned - async def _on_currency_chart_config_deactivate(self, message: Message): - await self._change_config('auto_currency_chart', message, False) - - @admin - @group - @bot_mentioned - async def _on_currency_chart_config_show(self, message: Message): - await self._show_config('auto_currency_chart', message) - - @admin - @group - @bot_mentioned - async def _on_delete_original_config_activate(self, message: Message): - await self._change_config('auto_delete_original', message, True) - - @admin - @group - @bot_mentioned - async def _on_delete_original_config_change(self, message: Message): - await self._change_config('auto_delete_original', message) - - @admin - @group - @bot_mentioned - async def _on_delete_original_config_deactivate(self, message: Message): - await self._change_config('auto_delete_original', message, False) - - @admin - @group - @bot_mentioned - 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 @@ -690,30 +559,6 @@ class FlanaBot(MultiBot, ABC): async def _on_scraping_audio(self, message: Message) -> OrderedSet[Media]: return await self._on_scraping(message, audio_only=True) - @admin - @group - @bot_mentioned - async def _on_scraping_config_activate(self, message: Message): - await self._change_config('auto_scraping', message, True) - - @admin - @group - @bot_mentioned - async def _on_scraping_config_change(self, message: Message): - await self._change_config('auto_scraping', message) - - @admin - @group - @bot_mentioned - async def _on_scraping_config_deactivate(self, message: Message): - await self._change_config('auto_scraping', message, False) - - @admin - @group - @bot_mentioned - async def _on_scraping_config_show(self, message: Message): - await self._show_config('auto_scraping', message) - @reply async def _on_song_info(self, message: Message): song_infos = message.replied_message.song_infos if message.replied_message else [] @@ -951,30 +796,6 @@ class FlanaBot(MultiBot, ABC): # noinspection PyTypeChecker BotAction(Action.AUTO_WEATHER_CHART, message, affected_objects=[bot_message]).save() - @admin - @group - @bot_mentioned - async def _on_weather_chart_config_activate(self, message: Message): - await self._change_config('auto_weather_chart', message, True) - - @admin - @group - @bot_mentioned - async def _on_weather_chart_config_change(self, message: Message): - await self._change_config('auto_weather_chart', message) - - @admin - @group - @bot_mentioned - async def _on_weather_chart_config_deactivate(self, message: Message): - await self._change_config('auto_weather_chart', message, False) - - @admin - @group - @bot_mentioned - async def _on_weather_chart_config_show(self, message: Message): - await self._show_config('auto_weather_chart', message) - # -------------------------------------------------------- # # -------------------- PUBLIC METHODS -------------------- # # -------------------------------------------------------- # diff --git a/tests/unit/test_parse_callbacks.py b/tests/unit/test_parse_callbacks.py index 54f8eea..b28e675 100644 --- a/tests/unit/test_parse_callbacks.py +++ b/tests/unit/test_parse_callbacks.py @@ -26,7 +26,7 @@ class TestParseCallbacks(unittest.TestCase): phrases = ['adios', 'taluego', 'adiooo', 'hasta la proxima', 'nos vemos', 'hasta la vista', 'hasta pronto'] self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_bye) - def test_on_config_list_show(self): + def test_on_config(self): phrases = [ 'flanabot ajustes', 'Flanabot ajustes', @@ -36,80 +36,12 @@ class TestParseCallbacks(unittest.TestCase): 'configuración', 'configuration' ] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_config_list_show) - - def test_on_covid_chart(self): - phrases = [ - 'cuantos contagios', - 'casos', - 'enfermos', - 'muerte', - 'pandemia', - 'enfermedad', - 'fallecidos', - 'mascarillas', - 'virus', - 'covid-19', - 'como va el covid', - 'lo peta el corona' - ] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_covid_chart) - - def test_on_currency_chart(self): - phrases = [ - 'como van esos dineros', - 'critodivisa', - 'esas cryptos', - 'inversion', - 'moneda', - 'mas caro en argentina?', - 'el puto bitcoin', - 'divisa' - ] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_currency_chart) - - def test_on_currency_chart_config_activate(self): - phrases = ['activa el bitcoin automatico'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_currency_chart_config_activate) - - def test_on_currency_chart_config_change(self): - phrases = ['cambia la config del bitcoin automatico'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_currency_chart_config_change) - - def test_on_currency_chart_config_deactivate(self): - phrases = ['desactiva el bitcoin automatico'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_currency_chart_config_deactivate) - - def test_on_currency_chart_config_show(self): - phrases = ['enseña el bitcoin automatico', 'como esta el bitcoin automatico', 'flanabot ajustes bitcoin'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_currency_chart_config_show) + self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_config) def test_on_delete(self): phrases = ['borra ese mensaje', 'borra ese mensaje puto', 'borra', 'borra el mensaje', 'borra eso', 'borres'] self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_delete) - def test_on_delete_original_config_activate(self): - phrases = [ - 'activa el borrado automatico', - 'flanabot pon el auto delete activado' - ] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_delete_original_config_activate) - - def test_on_delete_original_config_change(self): - phrases = ['cambia la config del borrado automatico'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_delete_original_config_change) - - def test_on_delete_original_config_deactivate(self): - phrases = [ - 'desactiva el borrado automatico', - 'flanabot pon el auto delete desactivado' - ] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_delete_original_config_deactivate) - - def test_on_delete_original_config_show(self): - phrases = ['enseña el borrado automatico', 'como esta el borrado automatico', 'flanabot ajustes delete'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_delete_original_config_show) - def test_on_hello(self): phrases = ['hola', 'hello', 'buenos dias', 'holaaaaaa', 'hi', 'holaaaaa', 'saludos', 'ola k ase'] self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_hello) @@ -186,22 +118,6 @@ class TestParseCallbacks(unittest.TestCase): ] self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_scraping) - def test_on_scraping_config_activate(self): - phrases = ['activa el scraping automatico', 'activa el scraping'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_scraping_config_activate) - - def test_on_scraping_config_change(self): - phrases = ['cambia la config del scraping'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_scraping_config_change) - - def test_on_scraping_config_deactivate(self): - phrases = ['desactiva el scraping automatico'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_scraping_config_deactivate) - - def test_on_scraping_config_show(self): - phrases = ['enseña el scraping automatico', 'como esta el scraping automatico', 'flanabot ajustes scraping'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_scraping_config_show) - def test_on_song_info(self): phrases = [ 'que sonaba ahi', @@ -267,19 +183,3 @@ class TestParseCallbacks(unittest.TestCase): 'pfff no ve que frio ahi en oviedo este finde' ] self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_weather_chart) - - def test_on_weather_chart_config_activate(self): - phrases = ['activa el tiempo automatico', 'activa el tiempo'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_weather_chart_config_activate) - - def test_on_weather_chart_config_change(self): - phrases = ['cambia la config del tiempo'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_weather_chart_config_change) - - def test_on_weather_chart_config_deactivate(self): - phrases = ['desactiva el tiempo automatico'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_weather_chart_config_deactivate) - - def test_on_weather_chart_config_show(self): - phrases = ['enseña el tiempo automatico', 'como esta el tiempo automatico', 'flanabot ajustes tiempo'] - self._test_no_always_callbacks(phrases, self.flana_tele_bot._on_weather_chart_config_show)