From 5553ec9a2fdad44ec98da6a5e2f3aa2ac6d49750 Mon Sep 17 00:00:00 2001 From: Verum Date: Wed, 26 Feb 2025 11:30:33 +0700 Subject: [PATCH] =?UTF-8?q?1.3=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=B1=D0=B0=D0=B7=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQLite3/bd.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/SQLite3/bd.py b/SQLite3/bd.py index 7b21e77..10b5d13 100644 --- a/SQLite3/bd.py +++ b/SQLite3/bd.py @@ -1,11 +1,8 @@ -# SQLite3/bd.py -# Файл для работы с базой данных пользователей бота - import sqlite3 from aiogram import types from datetime import datetime, timedelta, timezone -from BotLibrary import username, types_message +from BotLibrary import username as get_username, types_message from ProjectsFiles import Permissions bd_names: str = 'SQLite3/bd.db' @@ -72,7 +69,7 @@ async def add_user(tg_id: int, username: str, first_name: str, # Функция обновления пользователя async def update_user(tg_id: int, username: str = None, first_name: str = None, last_name: str = None, - bd_name: str = bd_names, status: str = None, role: str = None): + bd_name: str = bd_names, role: str = None): updates = [] params = [] @@ -85,9 +82,6 @@ async def update_user(tg_id: int, username: str = None, first_name: str = None, if last_name: updates.append("last_name = ?") params.append(last_name) - if status: - updates.append("status = ?") - params.append(status) if role: updates.append("role = ?") params.append(role) @@ -159,7 +153,7 @@ async def update_user_messages(tg_id: int, message: types.Message, bd_name: str # Основная обработка SQL async def base_sql(message: types.Message): tg_id = message.from_user.id - usernames = username(message) + usernames = get_username(message) # Изменено на get_username, чтобы избежать конфликта с переменной first_name = message.from_user.first_name last_name = message.from_user.last_name