1 files changed, 13 insertions, 19 deletions

diff --git a/handlers/pin.py b/handlers/pin.py
index fc81ed1..9eb91a4 100644
--- a/handlers/pin.py
+++ b/handlers/pin.py
@@ -1,22 +1,21 @@
 from aiogram import types as t
 
-from shared.instances import bot, dp
+from shared.instances import bot, config, dp
 from utils import filters as f
 
 
 @dp.message_handler(f.message.is_chat, commands=["pin"])
-async def закрепить_хуету(msg: t.Message):
+async def pin_command(msg: t.Message) -> None:
     await msg.delete()
     if msg.reply_to_message:
-        r = await msg.reply_to_message.reply(
+        reply = await msg.reply_to_message.reply(
             f'<a href="tg://user?id={msg.from_user.id}">{msg.from_user.mention}</a> хочет закрепить сообщение',
             parse_mode=t.ParseMode.HTML,
         )
-        await r.reply_poll(
-            "Закрепить ?",
+        await reply.reply_poll(
+            "Закрепить сообщение ?",
             [
                 "Да",
-                "УДАЛИ НАХУЙ",
                 "Нет",
             ],
             reply_markup=t.InlineKeyboardMarkup().add(
@@ -33,23 +32,18 @@ async def закрепить_хуету(msg: t.Message):
 @dp.callback_query_handler(
     f.message.is_chat, lambda clb: clb.data.split(":")[0] == "check_pin_poll"
 )
-async def проверить_закреп(clb: t.CallbackQuery):
+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
 
-    if poll.total_voter_count < 2:
-        await clb.answer(f"Нужно хотябы 2 голоса, сейчас {poll.total_voter_count}")
+    if poll.total_voter_count < min_answers:
+        await clb.answer(
+            f"Нужно хотябы {min_answers} голоса, сейчас {poll.total_voter_count}"
+        )
     else:
+        if poll.options[0].voter_count > poll.options[1].voter_count:
+            await msg.chat.pin_message(pin)
         if not poll.is_closed:
             await bot.stop_poll(msg.chat.id, msg.message_id)
-
-        yes = poll.options[0].voter_count
-        delete = poll.options[1].voter_count
-        win = max(yes, delete)
-
-        if win == yes:
-            await msg.chat.pin_message(pin)
-        elif win == delete:
-            await msg.chat.delete_message(pin)
-        await msg.delete()