diff options
| -rw-r--r-- | handlers/__init__.py | 1 | ||||
| -rw-r--r-- | handlers/gen.py | 51 | ||||
| -rw-r--r-- | poetry.lock | 13 | ||||
| -rw-r--r-- | pyproject.toml | 1 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | shared/commands.py | 10 |
6 files changed, 71 insertions, 7 deletions
diff --git a/handlers/__init__.py b/handlers/__init__.py index 16c0fe7..ab759fd 100644 --- a/handlers/__init__.py +++ b/handlers/__init__.py | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | from . import leave | 1 | from . import leave |
| 2 | from . import msg | 2 | from . import msg |
| 3 | from . import gen | ||
| 3 | from . import poll | 4 | from . import poll |
| 4 | from . import member | 5 | from . import member |
| 5 | from . import system | 6 | from . import system |
diff --git a/handlers/gen.py b/handlers/gen.py new file mode 100644 index 0000000..822b4ad --- /dev/null +++ b/handlers/gen.py | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | import mc | ||
| 2 | from aiogram import types as t | ||
| 3 | |||
| 4 | from shared import instances as ins | ||
| 5 | from shared.instances import dp, bot | ||
| 6 | from utils import filters as f | ||
| 7 | |||
| 8 | |||
| 9 | @dp.message_handler(f.message.is_chat, commands=["gen"]) | ||
| 10 | async def сгенерировать_хуету(msg: t.Message): | ||
| 11 | await msg.answer(получить_говно()) | ||
| 12 | |||
| 13 | |||
| 14 | @dp.message_handler(f.message.is_chat, commands=["del"]) | ||
| 15 | async def удалить_хуету(msg: t.Message): | ||
| 16 | await msg.delete() | ||
| 17 | |||
| 18 | if msg.reply_to_message: | ||
| 19 | if msg.reply_to_message.from_user.id in [bot.id, msg.from_user.id]: | ||
| 20 | await msg.reply_to_message.delete() | ||
| 21 | else: | ||
| 22 | await msg.answer("Ты умник, можно только свои или мои удалять") | ||
| 23 | else: | ||
| 24 | await msg.answer("Ты умник, ответь на сообщение") | ||
| 25 | |||
| 26 | |||
| 27 | @dp.message_handler(commands=["chance"]) | ||
| 28 | async def изменить_шанс_срания(msg: t.Message): | ||
| 29 | if msg.get_args(): | ||
| 30 | try: | ||
| 31 | chance = int(msg.get_args().split()[0]) | ||
| 32 | if 0 <= chance <= 100: | ||
| 33 | ins.gen_chance = chance | ||
| 34 | else: | ||
| 35 | raise RuntimeError() | ||
| 36 | |||
| 37 | await msg.answer(f"Теперь я сру с шансом в: {chance}%") | ||
| 38 | except Exception: | ||
| 39 | await msg.answer("Я хз что не так, но я знаю что ты дебил \n /chance <ЧИСЛО ОТ 0 ДО 100>") | ||
| 40 | else: | ||
| 41 | await msg.answer(f"Я сру с шансом в: {ins.gen_chance}%") | ||
| 42 | |||
| 43 | |||
| 44 | @dp.message_handler(f.message.chance, f.message.is_chat, content_types=[t.ContentType.ANY]) | ||
| 45 | async def срать_сообщение_с_шансом(msg: t.Message): | ||
| 46 | await msg.answer(получить_говно()) | ||
| 47 | |||
| 48 | |||
| 49 | def получить_говно() -> str: | ||
| 50 | samples = mc.util.load_txt_samples('samples.txt', separator='§') | ||
| 51 | return mc.StringGenerator(samples=samples).generate_string().capitalize() | ||
diff --git a/poetry.lock b/poetry.lock index d9af2da..90c31a4 100644 --- a/poetry.lock +++ b/poetry.lock | |||
| @@ -169,6 +169,14 @@ colors = ["colorama (>=0.4.3,<0.5.0)"] | |||
| 169 | plugins = ["setuptools"] | 169 | plugins = ["setuptools"] |
| 170 | 170 | ||
| 171 | [[package]] | 171 | [[package]] |
| 172 | name = "mc.py" | ||
| 173 | version = "3.1.1" | ||
| 174 | description = "String generator based on Markov process" | ||
| 175 | category = "main" | ||
| 176 | optional = false | ||
| 177 | python-versions = ">=3.6" | ||
| 178 | |||
| 179 | [[package]] | ||
| 172 | name = "multidict" | 180 | name = "multidict" |
| 173 | version = "6.0.2" | 181 | version = "6.0.2" |
| 174 | description = "multidict implementation" | 182 | description = "multidict implementation" |
| @@ -235,7 +243,7 @@ multidict = ">=4.0" | |||
| 235 | [metadata] | 243 | [metadata] |
| 236 | lock-version = "1.1" | 244 | lock-version = "1.1" |
| 237 | python-versions = "^3.10" | 245 | python-versions = "^3.10" |
| 238 | content-hash = "7c3c7f7de5b6df6ab3796df7636aa4eeb7de8f8ca136ec686aaf9cc4ae88cd6c" | 246 | content-hash = "efa0e2c5d3b8f77a22478a52ca869113f970e18c77d8da40a7d020c0eb572a0a" |
| 239 | 247 | ||
| 240 | [metadata.files] | 248 | [metadata.files] |
| 241 | aiogram = [ | 249 | aiogram = [ |
| @@ -442,6 +450,9 @@ isort = [ | |||
| 442 | {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, | 450 | {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, |
| 443 | {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, | 451 | {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, |
| 444 | ] | 452 | ] |
| 453 | "mc.py" = [ | ||
| 454 | {file = "mc.py-3.1.1.tar.gz", hash = "sha256:eaa4436add72c578c1d6dd257c13d6a802ebb8a997f50293176aa46676a2e5dd"}, | ||
| 455 | ] | ||
| 445 | multidict = [ | 456 | multidict = [ |
| 446 | {file = "multidict-6.0.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b9e95a740109c6047602f4db4da9949e6c5945cefbad34a1299775ddc9a62e2"}, | 457 | {file = "multidict-6.0.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b9e95a740109c6047602f4db4da9949e6c5945cefbad34a1299775ddc9a62e2"}, |
| 447 | {file = "multidict-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ac0e27844758d7177989ce406acc6a83c16ed4524ebc363c1f748cba184d89d3"}, | 458 | {file = "multidict-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ac0e27844758d7177989ce406acc6a83c16ed4524ebc363c1f748cba184d89d3"}, |
diff --git a/pyproject.toml b/pyproject.toml index ab2fe99..489bed2 100644 --- a/pyproject.toml +++ b/pyproject.toml | |||
| @@ -8,6 +8,7 @@ license = "GPL-3.0-only" | |||
| 8 | [tool.poetry.dependencies] | 8 | [tool.poetry.dependencies] |
| 9 | python = "^3.10" | 9 | python = "^3.10" |
| 10 | aiogram = "^2.20" | 10 | aiogram = "^2.20" |
| 11 | "mc.py" = "3.1.1" | ||
| 11 | 12 | ||
| 12 | [tool.poetry.dev-dependencies] | 13 | [tool.poetry.dev-dependencies] |
| 13 | black = "^22.3.0" | 14 | black = "^22.3.0" |
diff --git a/requirements.txt b/requirements.txt index 3a51d36..234bc0b 100644 --- a/requirements.txt +++ b/requirements.txt | |||
| @@ -155,6 +155,8 @@ frozenlist==1.3.0; python_version >= "3.7" \ | |||
| 155 | idna==3.3; python_version >= "3.7" \ | 155 | idna==3.3; python_version >= "3.7" \ |
| 156 | --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \ | 156 | --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \ |
| 157 | --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d | 157 | --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d |
| 158 | mc.py==3.1.1; python_version >= "3.6" \ | ||
| 159 | --hash=sha256:eaa4436add72c578c1d6dd257c13d6a802ebb8a997f50293176aa46676a2e5dd | ||
| 158 | multidict==6.0.2; python_version >= "3.7" \ | 160 | multidict==6.0.2; python_version >= "3.7" \ |
| 159 | --hash=sha256:0b9e95a740109c6047602f4db4da9949e6c5945cefbad34a1299775ddc9a62e2 \ | 161 | --hash=sha256:0b9e95a740109c6047602f4db4da9949e6c5945cefbad34a1299775ddc9a62e2 \ |
| 160 | --hash=sha256:ac0e27844758d7177989ce406acc6a83c16ed4524ebc363c1f748cba184d89d3 \ | 162 | --hash=sha256:ac0e27844758d7177989ce406acc6a83c16ed4524ebc363c1f748cba184d89d3 \ |
diff --git a/shared/commands.py b/shared/commands.py index a54a770..bf1a6cb 100644 --- a/shared/commands.py +++ b/shared/commands.py | |||
| @@ -4,11 +4,9 @@ from aiogram.types import BotCommandScopeAllPrivateChats as private | |||
| 4 | 4 | ||
| 5 | commands = { | 5 | commands = { |
| 6 | group(): [ | 6 | group(): [ |
| 7 | cmd("gen", "Высрвть текст"), | 7 | cmd("gen", "Покакать текстом"), |
| 8 | cmd("del", "Смыть говно"), | 8 | cmd("del", "Убрать говно"), |
| 9 | cmd("pin", "Повесить говно на стенку"), | 9 | cmd("pin", "Закрепить говно"), |
| 10 | cmd("gif", "Превратить картинку в gif"), | 10 | cmd("chance", "Установить шанс покакать в туалет"), |
| 11 | cmd("chance", "Установить шанс высирания говна"), | ||
| 12 | ], | 11 | ], |
| 13 | private(): [cmd("gif", "Превратить картинку в gif")], | ||
| 14 | } | 12 | } |
