diff options
| author | Igor Tolmachov <me@igorek.dev> | 2022-06-21 22:38:31 +0900 |
|---|---|---|
| committer | Igor Tolmachov <me@igorek.dev> | 2022-06-21 22:38:31 +0900 |
| commit | 6f325567b24f5ec4a2a6a989c20cb18a91f3bcf4 (patch) | |
| tree | 98fe917ca8042698fb5dcbe95cea6d636785e75b | |
| parent | 6371cb039869d4e6e6ebca693ba6711f3f220881 (diff) | |
| download | karpov_ai_bot-6f325567b24f5ec4a2a6a989c20cb18a91f3bcf4.tar.gz karpov_ai_bot-6f325567b24f5ec4a2a6a989c20cb18a91f3bcf4.zip | |
Убрал реквесты, телеграм добавил свою фичу
| -rw-r--r-- | handlers/__init__.py | 3 | ||||
| -rw-r--r-- | handlers/gen.py | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/handlers/__init__.py b/handlers/__init__.py index ab759fd..5de35a4 100644 --- a/handlers/__init__.py +++ b/handlers/__init__.py | |||
| @@ -2,5 +2,6 @@ from . import leave | |||
| 2 | from . import msg | 2 | from . import msg |
| 3 | from . import gen | 3 | from . import gen |
| 4 | from . import poll | 4 | from . import poll |
| 5 | from . import member | 5 | |
| 6 | # from . import member | ||
| 6 | from . import system | 7 | from . import system |
diff --git a/handlers/gen.py b/handlers/gen.py index 822b4ad..b192dac 100644 --- a/handlers/gen.py +++ b/handlers/gen.py | |||
| @@ -2,7 +2,7 @@ import mc | |||
| 2 | from aiogram import types as t | 2 | from aiogram import types as t |
| 3 | 3 | ||
| 4 | from shared import instances as ins | 4 | from shared import instances as ins |
| 5 | from shared.instances import dp, bot | 5 | from shared.instances import bot, dp |
| 6 | from utils import filters as f | 6 | from utils import filters as f |
| 7 | 7 | ||
| 8 | 8 | ||
| @@ -36,16 +36,20 @@ async def изменить_шанс_срания(msg: t.Message): | |||
| 36 | 36 | ||
| 37 | await msg.answer(f"Теперь я сру с шансом в: {chance}%") | 37 | await msg.answer(f"Теперь я сру с шансом в: {chance}%") |
| 38 | except Exception: | 38 | except Exception: |
| 39 | await msg.answer("Я хз что не так, но я знаю что ты дебил \n /chance <ЧИСЛО ОТ 0 ДО 100>") | 39 | await msg.answer( |
| 40 | "Я хз что не так, но я знаю что ты дебил \n /chance <ЧИСЛО ОТ 0 ДО 100>" | ||
| 41 | ) | ||
| 40 | else: | 42 | else: |
| 41 | await msg.answer(f"Я сру с шансом в: {ins.gen_chance}%") | 43 | await msg.answer(f"Я сру с шансом в: {ins.gen_chance}%") |
| 42 | 44 | ||
| 43 | 45 | ||
| 44 | @dp.message_handler(f.message.chance, f.message.is_chat, content_types=[t.ContentType.ANY]) | 46 | @dp.message_handler( |
| 47 | f.message.chance, f.message.is_chat, content_types=[t.ContentType.ANY] | ||
| 48 | ) | ||
| 45 | async def срать_сообщение_с_шансом(msg: t.Message): | 49 | async def срать_сообщение_с_шансом(msg: t.Message): |
| 46 | await msg.answer(получить_говно()) | 50 | await msg.answer(получить_говно()) |
| 47 | 51 | ||
| 48 | 52 | ||
| 49 | def получить_говно() -> str: | 53 | def получить_говно() -> str: |
| 50 | samples = mc.util.load_txt_samples('samples.txt', separator='§') | 54 | samples = mc.util.load_txt_samples("samples.txt", separator="§") |
| 51 | return mc.StringGenerator(samples=samples).generate_string().capitalize() | 55 | return mc.StringGenerator(samples=samples).generate_string().capitalize() |
