From 30c25053794c6c05c21e00e479753621268d87a2 Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Thu, 13 Mar 2025 13:10:22 +0300 Subject: [PATCH] =?UTF-8?q?`app`=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=B2=20`client`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/__init__.py | 2 +- app/__main__.py | 8 ++++---- app/actions.py | 30 +++++++++++++++--------------- app/utils.py | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 67fdb3d..0c66df4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,7 +16,7 @@ from .db import DataBase load_dotenv() # Выполняет чтение .env # Приложение -app = Client(getenv('ACCOUNT'), api_id=getenv('APP_ID'), api_hash=getenv('APP_HASH')) +client = Client(getenv('ACCOUNT'), api_id=getenv('APP_ID'), api_hash=getenv('APP_HASH')) # База данных db = DataBase(getenv('DB_PATH')) diff --git a/app/__main__.py b/app/__main__.py index 210529a..ff2a71d 100644 --- a/app/__main__.py +++ b/app/__main__.py @@ -2,12 +2,12 @@ import time # Импорт модулей приложения -from . import app, db, logger +from . import client, db, logger from .actions import get_top_wins, get_top_donates async def main(): - await app.start() + await client.start() logger.info('Клиент Telegram запущен') # Основной цикл программы @@ -24,7 +24,7 @@ async def main(): time.sleep(12 * 60 * 60) # 12 часов - await app.stop() + await client.stop() logger.info('Клиент Telegram остановлен') @@ -34,6 +34,6 @@ if __name__ == '__main__': logger.info('Выполняется подключение к базе данных') db.connect() - app.run(main()) + client.run(main()) db.close() logger.info('Приложение завершило работу') diff --git a/app/actions.py b/app/actions.py index cbdd4d0..89f1db5 100644 --- a/app/actions.py +++ b/app/actions.py @@ -2,41 +2,41 @@ import time # Импорт модулей приложения -from . import app, logger, BOT_NAME +from . import client, logger, BOT_NAME from .collect import parse_wins_top, parse_donates_top async def get_top_wins() -> None: logger.info('Выполняется получения списка побед клана') - await app.send_message(BOT_NAME, '🛡 Мой клан') + await client.send_message(BOT_NAME, '🛡 Мой клан') time.sleep(1) message_id = 0 - async for message in app.get_chat_history(BOT_NAME, limit=1): + async for message in client.get_chat_history(BOT_NAME, limit=1): message_id = message.id - await app.request_callback_answer( + await client.request_callback_answer( chat_id=BOT_NAME, message_id=message_id, callback_data='my_clan:tops:91:0:0:0:0:1', ) time.sleep(1) - async for message in app.get_chat_history(BOT_NAME, limit=1): + async for message in client.get_chat_history(BOT_NAME, limit=1): message_id = message.id - await app.request_callback_answer( + await client.request_callback_answer( chat_id=BOT_NAME, message_id=message_id, callback_data='my_clan:top-wins:91:0:0:0:0:1', ) time.sleep(1) - async for message in app.get_chat_history(BOT_NAME, limit=1): + async for message in client.get_chat_history(BOT_NAME, limit=1): parse_wins_top(message) - await app.read_chat_history(BOT_NAME) + await client.read_chat_history(BOT_NAME) logger.info('Получение списка побед клана завершено') @@ -44,33 +44,33 @@ async def get_top_wins() -> None: async def get_top_donates() -> None: logger.info('Выполняется получения списка пожертвований клана') - await app.send_message(BOT_NAME, '🛡 Мой клан') + await client.send_message(BOT_NAME, '🛡 Мой клан') time.sleep(1) message_id = 0 - async for message in app.get_chat_history(BOT_NAME, limit=1): + async for message in client.get_chat_history(BOT_NAME, limit=1): message_id = message.id - await app.request_callback_answer( + await client.request_callback_answer( chat_id=BOT_NAME, message_id=message_id, callback_data='my_clan:tops:91:0:0:0:0:1', ) time.sleep(1) - async for message in app.get_chat_history(BOT_NAME, limit=1): + async for message in client.get_chat_history(BOT_NAME, limit=1): message_id = message.id - await app.request_callback_answer( + await client.request_callback_answer( chat_id=BOT_NAME, message_id=message_id, callback_data='my_clan:top-donates:91:0:0:0:0:1', ) time.sleep(1) - async for message in app.get_chat_history(BOT_NAME, limit=1): + async for message in client.get_chat_history(BOT_NAME, limit=1): parse_donates_top(message) - await app.read_chat_history(BOT_NAME) + await client.read_chat_history(BOT_NAME) logger.info('Получение списка пожертвований клана завершено') diff --git a/app/utils.py b/app/utils.py index 32b2264..23c123a 100644 --- a/app/utils.py +++ b/app/utils.py @@ -1,8 +1,8 @@ -from . import app +from . import client async def get_telegram_id(username: str) -> int: """Возвращает Telegram ID по имени пользователя""" - telegram_user = await app.get_users(username) + telegram_user = await client.get_users(username) return telegram_user.id