From f269529659d43112e5cedfa76869089cc9ab1d0d Mon Sep 17 00:00:00 2001 From: Rykov7 Date: Sat, 28 Oct 2023 22:47:19 +0300 Subject: [PATCH] Fix delete quote bug --- app/stan.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/app/stan.py b/app/stan.py index b224859..bf4da65 100644 --- a/app/stan.py +++ b/app/stan.py @@ -3,6 +3,9 @@ import html import random import threading from time import sleep + +from sqlalchemy import delete + from .config import bot, types from .filters import is_white, is_nongrata from .models import session @@ -36,22 +39,13 @@ def act(message: types.Message): async def add_stan_quote(message: types.Message): if message.reply_to_message and message.reply_to_message.text: quote = html.escape(message.reply_to_message.text) - if quote not in [i[0] for i in session.query(Quote.text).filter( - Quote.chat_id == message.chat.id).all()]: + if quote not in [i[0] for i in session.query(Quote.text).filter(Quote.chat_id == message.chat.id).all()]: session.add(Quote(chat_id=message.chat.id, text=quote.replace("\n", " "))) session.commit() - await bot.send_message( - message.chat.id, - "✅ Добавил\n └ " - + quote.replace("\n", " ") - + "", - ) + await bot.send_message(message.chat.id, "✅ Добавил\n └ " + quote.replace("\n", " ") + "",) await bot.delete_message(message.chat.id, message.id) else: - await bot.send_message( - message.chat.id, - f"⛔️ Не добавил, есть токое\n └ {quote}", - ) + await bot.send_message(message.chat.id, f"⛔️ Не добавил, есть токое\n └ {quote}",) @bot.message_handler(func=is_white, commands=["remove"]) @@ -59,9 +53,9 @@ async def remove_stan_quote(message: types.Message): if message.reply_to_message and message.reply_to_message.text: quote = html.escape(message.reply_to_message.text) - already_exist = session.query(Quote).filter_by(text=quote, chat_id=message.chat.id).first() + already_exist = session.query(Quote.text).filter_by(text=quote, chat_id=message.chat.id).first() if already_exist: - session.delete(already_exist) + session.execute(delete(Quote).filter_by(text=quote, chat_id=message.chat.id)) session.commit() await bot.send_message(message.chat.id, f"✅ Удалил\n └ {quote}",)