diff --git a/main.py b/main.py index edb0426..120186e 100644 --- a/main.py +++ b/main.py @@ -12,22 +12,26 @@ bot = telebot.TeleBot(os.getenv("TELEGRAM_TOKEN")) all_letters = "йцукенгшщзхъёфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪЁФЫВАПРОЛДЖЭЯЧСМИТЬБЮQWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm1234567890 " -answers_rus = {"да", "дa"} -answers_eng = {"da", "dа"} -answers_net_rus = {'нет', 'нeт', 'hет', 'heт'} -answers_net_eng = {"net", "nеt"} -answers_where_rus = {"где", "гдe"} -answers_where_eng = {"gde", "gdе"} -answers_300 = {"300", "триста"} -answers_a = {"a", "а"} -answers_che = {"че", "чё", "чe", "чо", "чo"} -answers_aga = {"ага"} -answers_kak = {"как"} -answers_kto = {"кто"} -answers_200 = {"200", "двести"} -answers_slysh = {"слышь", "слыш"} -answers_hello = {"здрасте", "здрасьте"} -answers_ladno = {"ладно"} + + +answers = [ + [{"да", "дa"}, "Пизда!"], + [{"da", "dа"}, "Pizda!"], + [{'нет', 'нeт', 'hет', 'heт'}, "Пидора ответ!"], + [{"net", "nеt"}, "Pidora otvet!"], + [{"где", "гдe"}, "В пизде!"], + [{"gde", "gdе"}, "V pizde!"], + [{"300", "триста"}, "Отсоси у тракториста!"], + [{"a", "а"}, "Хуй на!"], + [{"че", "чё", "чe", "чо", "чo"}, "Хуй через плечо!"], + [{"ага", "ога"}, "В жопе нога!"], + [{"как"}, "Жопой об косяк!"], + [{"кто"}, "Конь в пальто!"], + [{"200", "двести"}, "Отсоси на месте!"], + [{"слышь", "слыш"}, "За углом поссышь!"], + [{"здрасте", "здрасьте"}, "Пизду покрасьте!"], + [{"ладно"}, "Прохладно!"] +] cache = TTLCache(settings.CACHE_SIZE, settings.CACHE_TTL) @@ -73,7 +77,7 @@ def set_probability(message: Message): @bot.message_handler(commands=['rating']) -def set_probability(message: Message): +def show_rating(message: Message): rating = list(mongo.counter_collection.find({"chat_id": message.chat.id}).sort("count", -1)) if not rating: bot.send_message(message.chat.id, "В этом чате я пока никому не парировал") @@ -108,38 +112,10 @@ def do_action(message: Message): else: return ans = None - if convert_text in answers_rus: - ans = "Пизда!" - if convert_text in answers_eng: - ans = "Pizda!" - if convert_text in answers_net_rus: - ans = "Пидора ответ!" - if convert_text in answers_net_eng: - ans = "Pidora otvet!" - if convert_text in answers_where_rus: - ans = "В пизде!" - if convert_text in answers_where_eng: - ans = "В pizde!" - if convert_text in answers_300: - ans = "Отсоси у тракториста!" - if convert_text in answers_a: - ans = "Хуй на!" - if convert_text in answers_che: - ans = "Хуй через плечо!" - if convert_text in answers_aga: - ans = "В жопе нога!" - if convert_text in answers_kak: - ans = "Жопой об косяк!" - if convert_text in answers_kto: - ans = "Конь в пальто!" - if convert_text in answers_200: - ans = "Отсоси на месте!" - if convert_text in answers_slysh: - ans = "За углом поссышь!" - if convert_text in answers_hello: - ans = "Пизду покрасьте!" - if convert_text in answers_ladno: - ans = "Прохладно!" + for key, value in answers: + if convert_text in key: + ans = value + break if ans is not None and randrange(1, 101) <= info["probability"]: bot.reply_to(message, ans) mongo.inc(message.from_user.username, message.chat.id)