From c7e3ee2ba8abadf3211d4bc415edb85abe286f01 Mon Sep 17 00:00:00 2001 From: hok7z Date: Fri, 13 Jan 2023 10:22:32 +0200 Subject: [PATCH] clean app.py --- app.py | 22 +++++++++------------- utils/notify_start.py | 12 ++++++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app.py b/app.py index 66e6fe4..b5bbaf2 100755 --- a/app.py +++ b/app.py @@ -24,19 +24,15 @@ WEBHOOK_PATH = f'/bot{config.token}/' WEBHOOK_URL = f"{WEBHOOK_HOST}{WEBHOOK_PATH}" async def on_startup(dp): - if not db.get_columns('members'): - db.create_tables([Member,Restriction]) - logging.warning("Member table is empty") - await bot.send_message(config.second_group_id, "First launch successful!") - await bot.send_message(config.second_group_id, "Member table is empty, run: `!reload`",parse_mode="Markdown") - - elif Member.select().count() == 0: - await bot.send_message(config.second_group_id, "Member table is empty, run `!reload`",parse_mode="Markdown") - logging.warning("Member table is empty") - - from utils.notify_start import notify_started_bot - await notify_started_bot(bot) + from utils.notify_start import notify_started_bot, database_is_empty + DATABASE_EMPTY = database_is_empty() + if DATABASE_EMPTY: + await bot.send_message(config.second_group_id, + "Member table is empty, run: `!reload`",parse_mode="Markdown") + + await notify_started_bot(bot) + from utils.default_commands import set_default_commands await set_default_commands(dp) @@ -58,7 +54,7 @@ async def on_shutdown(dp): await dp.storage.wait_closed() def main() -> None: - + if config.USE_WEBHOOK: executor.start_webhook( dispatcher=dp, diff --git a/utils/notify_start.py b/utils/notify_start.py index e26d4ea..8510a49 100644 --- a/utils/notify_start.py +++ b/utils/notify_start.py @@ -1,4 +1,16 @@ import config +from database import Member, Restriction +from database import db + +def database_is_empty(): + if not db.get_columns("members"): + db.create_tables([Member, Restriction]) + return True + + elif not Member.select().count(): + return True + + return False async def notify_started_bot(bot): await bot.send_message(config.second_group_id,"Bot successfully launched!")