2.0

6 files changed, 83 insertions, 77 deletions

diff --git a/handlers/config.py b/handlers/config.py
index 7eaf9eb..21d556b 100644
--- a/handlers/config.py
+++ b/handlers/config.py
@@ -1,7 +1,4 @@
-from ast import literal_eval
-from copy import deepcopy
-from logging import info
-from typing import Any, get_args
+from json import JSONDecodeError, dumps, loads
 
 from aiogram import types as t
 from pydantic import BaseModel, ValidationError
@@ -29,49 +26,71 @@ async def void_command(msg: t.Message) -> None:
 async def settings_command(msg: t.Message) -> None:
     def get_fields(config: BaseModel, level: int = 1) -> str:
         text = ""
-        for name in config.__fields__:
-            value = getattr(config, name)
-            if isinstance(value, BaseModel):
-                text += f"\n{' '*level*4}<code>{name}.</code>"
-                text += get_fields(value, level + 1)
+        for field_name in config.__fields__:
+            field = getattr(config, field_name)
+            field_info = config.__fields__[field_name].field_info
+
+            text += "\n" + "  " * level
+            if isinstance(field, BaseModel):
+                text += f"<code>{field_name}.</code> {field_info.description}"
+                text += get_fields(field, level + 1)
             else:
-                text += f"\n{' '*level*4}<code>{name}</code> = {value!r}"
+                text += f"<code>{field_name}</code> = {dumps(field)}"
         return text
 
-    args = msg.get_args().split()
-    chat_config = deepcopy(config.get_config(msg.chat.id))
-    try:
-        if len(args) == 0:
-            text = f"<code>/config</code>{get_fields(chat_config)}\n\n"
-            await msg.reply(text, parse_mode=t.ParseMode.HTML)
+    def get_field(config: BaseModel, path: list[str]) -> str:
+        text = ""
+        for field_name in path:
+            assert (
+                isinstance(config, BaseModel) and f in config.__fields__
+            ), "Параметр не найден"
+            field_info = config.__fields__[field_name].field_info
+            config = getattr(config, field_name)
+
+        text += field_info.description
+        text += "\n\n"
+        if isinstance(config, BaseModel):
+            text += f"<code>/config {'.'.join(path)}.</code>"
+            text += get_fields(config, 1)
         else:
-            conf = chat_config
-            *path, field = args[0].split(".")
-            for f in path:
-                conf = getattr(conf, f)
-                if not isinstance(conf, BaseModel):
-                    raise KeyError()
-
-            if len(args) == 2:
-                if isinstance(getattr(conf, field), BaseModel):
-                    raise KeyError()
-                value = args[1]
-                setattr(conf, field, literal_eval(value))
-
-                config.set_config(msg.chat.id, Config.parse_obj(chat_config.dict()))
-                config.save("data/config.json")
-
-                await msg.reply(
-                    f"<code>/config {args[0]}</code> = {getattr(conf, field)!r}",
-                    parse_mode=t.ParseMode.HTML,
-                )
-            else:
-                field_info = conf.__fields__[field].field_info
-                await msg.reply(
-                    f"<code>/config {args[0]}</code> = {getattr(conf, field)!r}\n{field_info.description}",
-                    parse_mode=t.ParseMode.HTML,
-                )
-    except (ValidationError, ValueError, SyntaxError):
-        await msg.reply("Неверное значение")
-    except (KeyError, AttributeError):
-        await msg.reply("Параметр не найден")
+            text += f"<code>/config {'.'.join(path)}</code> {dumps(config)}"
+        return text
+
+    def set_filed(config: BaseModel, path: list[str], value: str) -> str:
+        text = ""
+        field_name = path[-1]
+
+        for f in path[:-1]:
+            assert (
+                isinstance(config, BaseModel) and f in config.__fields__
+            ), "Параметр не найден"
+            config = getattr(config, f)
+
+        assert not isinstance(
+            getattr(config, field_name), BaseModel
+        ), "Нельзя установить значение для группы параметров"
+
+        setattr(config, field_name, loads(value))
+
+        text += (
+            f"Значение <code>{'.'.join(path)}</code> установлено на <code>{value}</code>"
+        )
+
+        return text
+
+    chat_config = config.get_config(msg.chat.id)
+    args = msg.get_args().split()
+    if len(args) == 0:
+        text = f"<code>/config</code>{get_fields(chat_config)}"
+    elif len(args) == 1:
+        text = get_field(chat_config, args[0].split("."))
+    elif len(args) == 2:
+        try:
+            text = set_filed(chat_config, args[0].split("."), args[1])
+            config.set_config(msg.chat.id, Config.parse_obj(chat_config.dict()))
+            config.save("data/config.json")
+        except (JSONDecodeError, ValidationError):
+            text = "Неверное значение"
+    else:
+        text = "Слишком много аргументов"
+    await msg.answer(text, parse_mode=t.ParseMode.HTML)
diff --git a/handlers/gen.py b/handlers/gen.py
index 8f19e96..e4398bd 100644
--- a/handlers/gen.py
+++ b/handlers/gen.py
@@ -17,7 +17,7 @@ def get_text(chat_id: int) -> str:
 
     assert (
         len(samples) != 0
-    ), "Нету с������ще����й на основе которых можно сгенерировать сообщение"
+    ), "Нету ����н��ых на основе которых можно сгенерировать сообщение"
 
     generator = mc.PhraseGenerator(samples)
     gen_config = config.get_config(chat_id).gen
diff --git a/handlers/member.py b/handlers/member.py
index a4fc4cc..830351d 100644
--- a/handlers/member.py
+++ b/handlers/member.py
@@ -38,7 +38,7 @@ async def check_poll(clb: t.CallbackQuery) -> None:
     msg = clb.message
     data = clb.data.split(":")
     user_id = int(data[1])
-    min_answers = config.get_config(msg.chat.id).commands.accept_member_answers_count
+    min_answers = config.get_config(msg.chat.id).members.answer_count
 
     if poll.total_voter_count < min_answers:
         await clb.answer(
diff --git a/handlers/msg.py b/handlers/msg.py
deleted file mode 100644
index a57885b..0000000
--- a/handlers/msg.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from aiogram import types as t
-
-from shared.instances import dp
-from utils import filters as f
-
-
-async def сосалка(msg: t.Message):
-    text = msg.text or msg.caption
-    if text.startswith("/"):
-        return False
-    with open(f"data/{msg.chat.id}", "a+") as file:
-        file.write(text.replace("§", "") + "§")
-    return False
-
-
-@dp.message_handler(f.message.has_text, сосалка, content_types=[t.ContentType.ANY])
-async def ХУЙ():
-    pass
diff --git a/handlers/pin.py b/handlers/pin.py
index 9eb91a4..17995ee 100644
--- a/handlers/pin.py
+++ b/handlers/pin.py
@@ -18,6 +18,7 @@ async def pin_command(msg: t.Message) -> None:
                 "Да",
                 "Нет",
             ],
+            config.get_config(msg.chat.id).pin.anonym,
             reply_markup=t.InlineKeyboardMarkup().add(
                 t.InlineKeyboardButton(
                     "Проверить опрос",
@@ -26,7 +27,7 @@ async def pin_command(msg: t.Message) -> None:
             ),
         )
     else:
-        await msg.answer("��ы у������к, ответь на сообщение")
+        await msg.answer("��ы н�� ответили на сообщение")
 
 
 @dp.callback_query_handler(
@@ -36,7 +37,7 @@ async def check_poll(clb: t.CallbackQuery) -> None:
     poll = clb.message.poll
     msg = clb.message
     pin = int(clb.data.split(":")[1])
-    min_answers = config.get_config(msg.chat.id).commands.pin_answers_count
+    min_answers = config.get_config(msg.chat.id).pin.answer_count
 
     if poll.total_voter_count < min_answers:
         await clb.answer(
diff --git a/shared/settings.py b/shared/settings.py
index 20f3f76..731fade 100644
--- a/shared/settings.py
+++ b/shared/settings.py
@@ -26,14 +26,14 @@ class GenConfig(BaseModel):
     )
 
 
-class CommandsConfig(BaseModel):
-    pin_answers_count: int = Field(
+class PollConfig(BaseModel):
+    answer_count: int = Field(
         4,
-        description="Минимальное количество голосов для проверки опроса на закрепление сообщения",
+        description="Минимальное количество голосов для проверки опроса",
     )
-    accept_member_answers_count: int = Field(
-        5,
-        description="Минимальное количество голосов для проверки опроса на принятия человека в группу",
+    anonym: bool = Field(
+        False,
+        description="Включить/Выключить анонимный опрос",
     )
 
 
@@ -42,9 +42,13 @@ class Config(BaseModel):
         GenConfig(),
         description="Настройки генерации сообщений",
     )
-    commands: CommandsConfig = Field(
-        CommandsConfig(),
-        description="Настройки команд бота",
+    pin: PollConfig = Field(
+        PollConfig(),
+        description="Настройки закрепления сообщений",
+    )
+    members: PollConfig = Field(
+        PollConfig(),
+        description="Настройки принятия людей в группу",
     )