From 04b5f5394e8522eb860cccfe654b3b6f2e032e4a Mon Sep 17 00:00:00 2001 From: Igor Tolmachov Date: Thu, 30 Jun 2022 18:35:20 +0900 Subject: Теперь шанс разный для каждого чата MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handlers/gen.py | 4 ++-- pyproject.toml | 6 +++--- shared/instances.py | 2 +- 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): try: chance = int(msg.get_args().split()[0]) if 0 <= chance <= 100: - ins.gen_chance = chance + ins.gen_chance[msg.chat.id] = chance else: raise RuntimeError() @@ -40,7 +40,7 @@ async def изменить_шанс_срания(msg: t.Message): "Я хз что не так, но я знаю что ты дебил \n /chance <ЧИСЛО ОТ 0 ДО 100>" ) else: - await msg.answer(f"Я сру с шансом в: {ins.gen_chance}%") + await msg.answer(f"Я сру с шансом в: {ins.gen_chance.get(msg.chat.id, 10)}%") @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 [tool.mypy] ignore_missing_imports = true -disallow_untyped_defs = true -disallow_untyped_calls = true +disallow_untyped_defs = false +disallow_untyped_calls = false [tool.isort] profile = "black" filter_files = true -extend_skip = ["__init__.py"] \ No newline at end of file +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 bot = Bot(token=token) dp = Dispatcher(bot) -gen_chance = 10 +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 @@ from __future__ import annotations -from random import random +from random import randint from aiogram import filters as f from aiogram import types as t @@ -15,7 +15,7 @@ class message: @staticmethod def chance(msg: t.Message): - return random() <= (ins.gen_chance / 100) + return ins.gen_chance.get(msg.chat.id, 10) <= randint(1, 100) @staticmethod def has_text(msg: t.Message): -- cgit v1.2.3