From d02d5d4df29a6b7ba4763256a338b7cbfd6c74cb Mon Sep 17 00:00:00 2001 From: AlberLC Date: Fri, 17 Feb 2023 05:32:03 +0100 Subject: [PATCH] Update SCRAPING_TIMEOUT_SECONDS --- flanabot/bots/flana_disc_bot.py | 2 +- flanabot/bots/flana_tele_bot.py | 3 ++- flanabot/constants.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flanabot/bots/flana_disc_bot.py b/flanabot/bots/flana_disc_bot.py index 376ae13..ec5dd17 100644 --- a/flanabot/bots/flana_disc_bot.py +++ b/flanabot/bots/flana_disc_bot.py @@ -114,7 +114,7 @@ class FlanaDiscBot(DiscordBot, FlanaBot): message: Message, force=False, audio_only=False, - timeout_for_media: int | float = 15 + timeout_for_media: int | float = constants.SCRAPING_TIMEOUT_SECONDS ) -> OrderedSet[Media]: return await super()._search_medias(message, force, audio_only, timeout_for_media) diff --git a/flanabot/bots/flana_tele_bot.py b/flanabot/bots/flana_tele_bot.py index 1252d6d..9d8caac 100644 --- a/flanabot/bots/flana_tele_bot.py +++ b/flanabot/bots/flana_tele_bot.py @@ -10,6 +10,7 @@ import telethon.tl.functions from flanautils import Media, OrderedSet from multibot import TelegramBot, find_message, user_client +from flanabot import constants from flanabot.bots.flana_bot import FlanaBot from flanabot.models import Message @@ -57,7 +58,7 @@ class FlanaTeleBot(TelegramBot, FlanaBot): message: Message, force=False, audio_only=False, - timeout_for_media: int | float = 15 + timeout_for_media: int | float = constants.SCRAPING_TIMEOUT_SECONDS ) -> OrderedSet[Media]: return await super()._search_medias(message, force, audio_only, timeout_for_media) diff --git a/flanabot/constants.py b/flanabot/constants.py index 5759d71..7766783 100644 --- a/flanabot/constants.py +++ b/flanabot/constants.py @@ -11,7 +11,6 @@ CONNECT_4_AI_DELAY_SECONDS = 1 CONNECT_4_CENTER_COLUMN_POINTS = 2 CONNECT_4_N_COLUMNS = 7 CONNECT_4_N_ROWS = 6 - FLOOD_2s_LIMIT = 2 FLOOD_7s_LIMIT = 4 HEAT_PERIOD_SECONDS = datetime.timedelta(minutes=15).total_seconds() @@ -20,6 +19,7 @@ MAX_PLACE_QUERY_LENGTH = 50 PUNISHMENT_INCREMENT_EXPONENT = 6 PUNISHMENTS_RESET_TIME = datetime.timedelta(weeks=2) RECOVERY_DELETED_MESSAGE_BEFORE = datetime.timedelta(hours=1) +SCRAPING_TIMEOUT_SECONDS = 7 BYE_PHRASES = ('Adiós.', 'adio', 'adioh', 'adios', 'adió', 'adiós', 'agur', 'bye', 'byyeeee', 'chao', 'hasta la vista', 'hasta luego', 'hasta nunca', ' hasta pronto', 'hasta la próxima', 'nos vemos', 'taluego')