From c1bf9c1e53ef8bed30090141300bc1163a3453f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sun, 13 Oct 2024 19:06:47 +0200 Subject: [PATCH] Fix minor problems with user IDs and datetime --- telegram_downloader_bot/main.py | 7 ++----- telegram_downloader_bot/security.py | 12 ++++++++---- telegram_downloader_bot/utils.py | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/telegram_downloader_bot/main.py b/telegram_downloader_bot/main.py index 15f4273..fa53269 100644 --- a/telegram_downloader_bot/main.py +++ b/telegram_downloader_bot/main.py @@ -55,16 +55,13 @@ async def message_handler(_, message: Message): "No TikTok URLs found! Nothing to download!" ) - success_count = 0 for i, url in enumerate(urls): msg = f"Downloading video {i+1}/{len(urls)}..." log.info(msg) await message.reply_text(msg) - outcome = utils.download_tt_video(STORAGE, url) - success_count += 1 if outcome else 0 + utils.download_tt_video(STORAGE, url) - await message.reply_text(f"{success_count}/{len(urls)} " - "video(s) downloaded") + await message.reply_text("Done.") @app.on_message(filters.media) diff --git a/telegram_downloader_bot/security.py b/telegram_downloader_bot/security.py index 6494046..1ff11b0 100644 --- a/telegram_downloader_bot/security.py +++ b/telegram_downloader_bot/security.py @@ -1,18 +1,22 @@ import os from functools import wraps +from telegram_downloader_bot.logger import log + # Comma separated list of Telegram IDs that this bot will respond to allowed_ids_raw = os.getenv("ALLOWED_IDS", "") allowed_ids = allowed_ids_raw.split(",") - -print(allowed_ids_raw) -print(allowed_ids) +allowed_ids = [int(x) for x in allowed_ids] def protected(func): @wraps(func) async def wrapper(client, message): - if message.from_user.id not in allowed_ids: + if int(message.from_user.id) not in allowed_ids: + log.warning( + f"User with ID {message.from_user.id} attempted to text this bot!") + log.info( + f"Only users allowed are: {' '.join(allowed_ids)}") return await message.reply_text("You are not on the list!") return await func(client, message) return wrapper diff --git a/telegram_downloader_bot/utils.py b/telegram_downloader_bot/utils.py index e7577c6..370209e 100644 --- a/telegram_downloader_bot/utils.py +++ b/telegram_downloader_bot/utils.py @@ -99,7 +99,7 @@ def download_tt_video(storage_path: str, url: str) -> None: Makes sure the video integrity is correct.""" videos = snaptik(url) - now = datetime.datetime.now() + now = datetime.now() for video in videos: video_filename = now.strftime("video-tiktok-%Y-%m-%d_%H-%M-%S.mp4")