diff options
| author | Igor Tolmachov <me@igorek.dev> | 2022-06-30 18:35:20 +0900 |
|---|---|---|
| committer | Igor Tolmachov <me@igorek.dev> | 2022-06-30 18:35:20 +0900 |
| commit | 04b5f5394e8522eb860cccfe654b3b6f2e032e4a (patch) | |
| tree | 7eaf2121b318c7b4d8118680e5be0a21ba3d8f64 | |
| parent | 1c611e2b0f6657ac7bb226d17de8e3c63b8f7162 (diff) | |
| download | karpov_ai_bot-04b5f5394e8522eb860cccfe654b3b6f2e032e4a.tar.gz karpov_ai_bot-04b5f5394e8522eb860cccfe654b3b6f2e032e4a.zip | |
Теперь шанс разный для каждого чата
| -rw-r--r-- | handlers/gen.py | 4 | ||||
| -rw-r--r-- | pyproject.toml | 6 | ||||
| -rw-r--r-- | shared/instances.py | 2 | ||||
| -rw-r--r-- | utils/filters.py | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/handlers/gen.py b/handlers/gen.py index b192dac..55ea01a 100644 --- a/handlers/gen.py +++ b/handlers/gen.py | |||
| @@ -30,7 +30,7 @@ async def изменить_шанс_срания(msg: t.Message): | |||
| 30 | try: | 30 | try: |
| 31 | chance = int(msg.get_args().split()[0]) | 31 | chance = int(msg.get_args().split()[0]) |
| 32 | if 0 <= chance <= 100: | 32 | if 0 <= chance <= 100: |
| 33 | ins.gen_chance = chance | 33 | ins.gen_chance[msg.chat.id] = chance |
| 34 | else: | 34 | else: |
| 35 | raise RuntimeError() | 35 | raise RuntimeError() |
| 36 | 36 | ||
| @@ -40,7 +40,7 @@ async def изменить_шанс_срания(msg: t.Message): | |||
| 40 | "Я хз что не так, но я знаю что ты дебил \n /chance <ЧИСЛО ОТ 0 ДО 100>" | 40 | "Я хз что не так, но я знаю что ты дебил \n /chance <ЧИСЛО ОТ 0 ДО 100>" |
| 41 | ) | 41 | ) |
| 42 | else: | 42 | else: |
| 43 | await msg.answer(f"Я сру с шансом в: {ins.gen_chance}%") | 43 | await msg.answer(f"Я сру с шансом в: {ins.gen_chance.get(msg.chat.id, 10)}%") |
| 44 | 44 | ||
| 45 | 45 | ||
| 46 | @dp.message_handler( | 46 | @dp.message_handler( |
diff --git a/pyproject.toml b/pyproject.toml index 489bed2..36f6956 100644 --- a/pyproject.toml +++ b/pyproject.toml | |||
| @@ -19,10 +19,10 @@ line-length = 90 | |||
| 19 | 19 | ||
| 20 | [tool.mypy] | 20 | [tool.mypy] |
| 21 | ignore_missing_imports = true | 21 | ignore_missing_imports = true |
| 22 | disallow_untyped_defs = true | 22 | disallow_untyped_defs = false |
| 23 | disallow_untyped_calls = true | 23 | disallow_untyped_calls = false |
| 24 | 24 | ||
| 25 | [tool.isort] | 25 | [tool.isort] |
| 26 | profile = "black" | 26 | profile = "black" |
| 27 | filter_files = true | 27 | filter_files = true |
| 28 | extend_skip = ["__init__.py"] \ No newline at end of file | 28 | extend_skip = ["__init__.py"] |
diff --git a/shared/instances.py b/shared/instances.py index 280ec49..c1234b2 100644 --- a/shared/instances.py +++ b/shared/instances.py | |||
| @@ -4,4 +4,4 @@ from config import token | |||
| 4 | 4 | ||
| 5 | bot = Bot(token=token) | 5 | bot = Bot(token=token) |
| 6 | dp = Dispatcher(bot) | 6 | dp = Dispatcher(bot) |
| 7 | gen_chance = 10 | 7 | gen_chance = {} |
diff --git a/utils/filters.py b/utils/filters.py index 54963da..9782a27 100644 --- a/utils/filters.py +++ b/utils/filters.py | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | from __future__ import annotations | 1 | from __future__ import annotations |
| 2 | 2 | ||
| 3 | from random import random | 3 | from random import randint |
| 4 | 4 | ||
| 5 | from aiogram import filters as f | 5 | from aiogram import filters as f |
| 6 | from aiogram import types as t | 6 | from aiogram import types as t |
| @@ -15,7 +15,7 @@ class message: | |||
| 15 | 15 | ||
| 16 | @staticmethod | 16 | @staticmethod |
| 17 | def chance(msg: t.Message): | 17 | def chance(msg: t.Message): |
| 18 | return random() <= (ins.gen_chance / 100) | 18 | return ins.gen_chance.get(msg.chat.id, 10) <= randint(1, 100) |
| 19 | 19 | ||
| 20 | @staticmethod | 20 | @staticmethod |
| 21 | def has_text(msg: t.Message): | 21 | def has_text(msg: t.Message): |
