From b61964fdf8930138571db11b9d359c51aa2e0d92 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Sat, 7 Jan 2023 22:13:10 +0530 Subject: [PATCH 01/32] Warning --- README.md | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/README.md b/README.md index c6fbad5..aaf17ed 100644 --- a/README.md +++ b/README.md @@ -1,37 +1 @@ -## X-URL-Uploader (Bot) ---- - -Telegram RoBot to Upload Links. - -**Features**: - -๐Ÿ‘‰ Only Auth Users (AUTH_USERS) Can Use The Bot - -๐Ÿ‘‰ Upload [YTDL Supported Links](https://ytdl-org.github.io/youtube-dl/supportedsites.html) to Telegram. - -๐Ÿ‘‰ Upload HTTP/HTTPS as File/Video to Telegram. - -๐Ÿ‘‰ Upload Mediafire, Zippyshare, Hxfile, Anonfiles, Antfiles URL using LK21 - -**For Devs**: - -๐Ÿ‘‰ [X-URL-Uploader-dev](https://github.com/X-Gorn/X-URL-Uploader/tree/dev) - -**Deploying on VPS**: - -[![YouTube Video Views](https://img.shields.io/youtube/views/SKrEaAavhMs?logoColor=black)](https://youtu.be/SKrEaAavhMs) - -## Telegram Support: - -[![Channel](https://img.shields.io/badge/TG-Channel-30302f?style=flat&logo=telegram)](https://t.me/xTeamBots) -[![Group](https://img.shields.io/badge/TG-Group-30302f?style=flat&logo=telegram)](https://t.me/xTeamBotsSupport) - -## Credits, and Thanks to: - -* [@TGExplore](https://t.me/ViruZs) for his [TG-URL-Uploader](https://github.com/TGExplore/TG-URL-Uploader) -* [@SpEcHlDe](https://t.me/ThankTelegram) for his [AnyDLBot](https://telegram.dog/AnyDLBot) -* [Dan Tรจs](https://t.me/haskell) for his [Pyrogram Library](https://github.com/pyrogram/pyrogram) -* [Yoily](https://t.me/YoilyL) for his [UploaditBot](https://telegram.dog/UploaditBot) - -#### LICENSE -- GPLv3 +## Nothing To See HERE !! please Dont fork this repo From bc43679ff0fc134a999207fb4244ee7b7b5ea92c Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Sat, 7 Jan 2023 22:17:15 +0530 Subject: [PATCH 02/32] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index aaf17ed..6371da5 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -## Nothing To See HERE !! please Dont fork this repo +#### Currently Working on this ๐Ÿ‘ + +## โ—๏ธ Nothing To See HERE !! please Dont fork this repo โ—๏ธ From 8d00e645141c8f3e86f4c8414a0d612f222eb25f Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Sat, 7 Jan 2023 22:21:48 +0530 Subject: [PATCH 03/32] Update requirements.txt --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8d18f80..a50e571 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,5 +13,3 @@ filetype tldextract Flask==2.2.2 gunicorn==20.1.0 -pymongo[srv]==3.12.3 - From 86ea36c6217115f313e84c03da7b1fb126a2c742 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Sun, 8 Jan 2023 11:07:58 +0530 Subject: [PATCH 04/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6371da5..dad01ab 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -#### Currently Working on this ๐Ÿ‘ +### Currently Working on this ๐Ÿ‘ ## โ—๏ธ Nothing To See HERE !! please Dont fork this repo โ—๏ธ From 2a54d303f1cce3e8184055a45edb23874983e5ea Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Sun, 8 Jan 2023 17:28:55 +0530 Subject: [PATCH 05/32] Add files via upload --- README.md | 38 ++++++++++++++++++++++++++++++++-- config.py | 30 +++++++++++++++++++++++++++ helper_funcs/help_uploadbot.py | 2 ++ runtime.txt | 2 +- sample_config.py | 2 ++ 5 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 config.py diff --git a/README.md b/README.md index dad01ab..c6fbad5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,37 @@ -### Currently Working on this ๐Ÿ‘ +## X-URL-Uploader (Bot) +--- -## โ—๏ธ Nothing To See HERE !! please Dont fork this repo โ—๏ธ +Telegram RoBot to Upload Links. + +**Features**: + +๐Ÿ‘‰ Only Auth Users (AUTH_USERS) Can Use The Bot + +๐Ÿ‘‰ Upload [YTDL Supported Links](https://ytdl-org.github.io/youtube-dl/supportedsites.html) to Telegram. + +๐Ÿ‘‰ Upload HTTP/HTTPS as File/Video to Telegram. + +๐Ÿ‘‰ Upload Mediafire, Zippyshare, Hxfile, Anonfiles, Antfiles URL using LK21 + +**For Devs**: + +๐Ÿ‘‰ [X-URL-Uploader-dev](https://github.com/X-Gorn/X-URL-Uploader/tree/dev) + +**Deploying on VPS**: + +[![YouTube Video Views](https://img.shields.io/youtube/views/SKrEaAavhMs?logoColor=black)](https://youtu.be/SKrEaAavhMs) + +## Telegram Support: + +[![Channel](https://img.shields.io/badge/TG-Channel-30302f?style=flat&logo=telegram)](https://t.me/xTeamBots) +[![Group](https://img.shields.io/badge/TG-Group-30302f?style=flat&logo=telegram)](https://t.me/xTeamBotsSupport) + +## Credits, and Thanks to: + +* [@TGExplore](https://t.me/ViruZs) for his [TG-URL-Uploader](https://github.com/TGExplore/TG-URL-Uploader) +* [@SpEcHlDe](https://t.me/ThankTelegram) for his [AnyDLBot](https://telegram.dog/AnyDLBot) +* [Dan Tรจs](https://t.me/haskell) for his [Pyrogram Library](https://github.com/pyrogram/pyrogram) +* [Yoily](https://t.me/YoilyL) for his [UploaditBot](https://telegram.dog/UploaditBot) + +#### LICENSE +- GPLv3 diff --git a/config.py b/config.py new file mode 100644 index 0000000..ebb8600 --- /dev/null +++ b/config.py @@ -0,0 +1,30 @@ +import os + +class Config(object): + # get a token from @BotFather + TG_BOT_TOKEN = os.environ.get("TG_BOT_TOKEN", "") + # The Telegram API things + APP_ID = int(os.environ.get("APP_ID", 12345)) + API_HASH = os.environ.get("API_HASH") + # Get these values from my.telegram.org + # Array to store users who are authorized to use the bot + AUTH_USERS = set(int(x) for x in os.environ.get("AUTH_USERS", "").split()) + # the download location, where the HTTP Server runs + DOWNLOAD_LOCATION = "./DOWNLOADS" + # Telegram maximum file upload size + MAX_FILE_SIZE = 50000000 + TG_MAX_FILE_SIZE = 2097152000 + FREE_USER_MAX_FILE_SIZE = 50000000 + # chunk size that should be used with requests + CHUNK_SIZE = int(os.environ.get("CHUNK_SIZE", 128)) + # default thumbnail to be used in the videos + DEF_THUMB_NAIL_VID_S = os.environ.get("DEF_THUMB_NAIL_VID_S", "") + # proxy for accessing youtube-dl in GeoRestricted Areas + # Get your own proxy from https://github.com/rg3/youtube-dl/issues/1091#issuecomment-230163061 + HTTP_PROXY = os.environ.get("HTTP_PROXY", "") + # maximum message length in Telegram + MAX_MESSAGE_LENGTH = 4096 + # set timeout for subprocess + PROCESS_MAX_TIMEOUT = 3600 + # watermark file + DEF_WATER_MARK_FILE = "" diff --git a/helper_funcs/help_uploadbot.py b/helper_funcs/help_uploadbot.py index b10c8c9..2cd5cfc 100644 --- a/helper_funcs/help_uploadbot.py +++ b/helper_funcs/help_uploadbot.py @@ -4,6 +4,8 @@ # the logging things import logging +import time +from helper_funcs.display_progress import humanbytes logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') logger = logging.getLogger(__name__) diff --git a/runtime.txt b/runtime.txt index 83c5b9d..684075a 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.8.6 +python-3.10.9 diff --git a/sample_config.py b/sample_config.py index ebb8600..dbce4b8 100644 --- a/sample_config.py +++ b/sample_config.py @@ -28,3 +28,5 @@ class Config(object): PROCESS_MAX_TIMEOUT = 3600 # watermark file DEF_WATER_MARK_FILE = "" + LOG_CHANNEL = int(os.environ.get("LOG_CHANNEL", -100)) + From eabb87f155e52b929679f66851a809aaa4f5f899 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Sun, 8 Jan 2023 23:47:26 +0530 Subject: [PATCH 06/32] Delete README.md --- README.md | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index c6fbad5..0000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -## X-URL-Uploader (Bot) ---- - -Telegram RoBot to Upload Links. - -**Features**: - -๐Ÿ‘‰ Only Auth Users (AUTH_USERS) Can Use The Bot - -๐Ÿ‘‰ Upload [YTDL Supported Links](https://ytdl-org.github.io/youtube-dl/supportedsites.html) to Telegram. - -๐Ÿ‘‰ Upload HTTP/HTTPS as File/Video to Telegram. - -๐Ÿ‘‰ Upload Mediafire, Zippyshare, Hxfile, Anonfiles, Antfiles URL using LK21 - -**For Devs**: - -๐Ÿ‘‰ [X-URL-Uploader-dev](https://github.com/X-Gorn/X-URL-Uploader/tree/dev) - -**Deploying on VPS**: - -[![YouTube Video Views](https://img.shields.io/youtube/views/SKrEaAavhMs?logoColor=black)](https://youtu.be/SKrEaAavhMs) - -## Telegram Support: - -[![Channel](https://img.shields.io/badge/TG-Channel-30302f?style=flat&logo=telegram)](https://t.me/xTeamBots) -[![Group](https://img.shields.io/badge/TG-Group-30302f?style=flat&logo=telegram)](https://t.me/xTeamBotsSupport) - -## Credits, and Thanks to: - -* [@TGExplore](https://t.me/ViruZs) for his [TG-URL-Uploader](https://github.com/TGExplore/TG-URL-Uploader) -* [@SpEcHlDe](https://t.me/ThankTelegram) for his [AnyDLBot](https://telegram.dog/AnyDLBot) -* [Dan Tรจs](https://t.me/haskell) for his [Pyrogram Library](https://github.com/pyrogram/pyrogram) -* [Yoily](https://t.me/YoilyL) for his [UploaditBot](https://telegram.dog/UploaditBot) - -#### LICENSE -- GPLv3 From 35ee2689bfb22007cb49d97372626492098da1d6 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Sun, 8 Jan 2023 23:48:24 +0530 Subject: [PATCH 07/32] Add files via upload --- app.json | 11 +++++------ app.py | 2 +- bot.py | 6 +++--- config.py | 4 ++-- helper_funcs/display_progress.py | 6 +++--- helper_funcs/help_Nekmo_ffmpeg.py | 2 +- helper_funcs/help_uploadbot.py | 2 +- plugins/cb_buttons.py | 5 ++--- plugins/custom_thumbnail.py | 2 +- plugins/dl_button.py | 16 ++++++++-------- plugins/help_text.py | 26 +++++++++++++++++++++----- sample_config.py | 4 ++-- translation.py | 25 +++++++++++++++++-------- 13 files changed, 67 insertions(+), 44 deletions(-) diff --git a/app.json b/app.json index 7ce1c0d..5eb5ee9 100644 --- a/app.json +++ b/app.json @@ -2,18 +2,17 @@ "name": "X-URL-Uploader", "description": "Telegram Bot to Upload URLs to Telegram as File and Video.", "keywords": [ - "telegram", - "best", - "youtube", + "LazyDeveloper", + "LazyPrincess", + "url-uploader-src", "downloader", "open", "source", "multi", "purpose", "ffmpeg", - "remote", - "uploader" - ], + "remote" + ], "success_url": "https://t.me/LazyDeveloper", "website": "https://github.com/LazyDeveloperr", "repository": "https://github.com/LazyDeveloperr/test100", diff --git a/app.py b/app.py index 2494382..da363db 100644 --- a/app.py +++ b/app.py @@ -1,4 +1,4 @@ -#Thank you LazyDeveloper for helping me in this journey ! +#Thank you LazyDeveloper for helping developers in this journey ! #Must Subscribe On YouTube @LazyDeveloperr from flask import Flask diff --git a/bot.py b/bot.py index 432ad27..c91bbb3 100644 --- a/bot.py +++ b/bot.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# (c) Shrimadhav U K +# (c) Thank you @LazyDeveloperr # the logging things import logging @@ -28,11 +28,11 @@ root="plugins" ) app = pyrogram.Client( - "X-URL-Uploader", + "LazyMissPerfect", bot_token=Config.TG_BOT_TOKEN, api_id=Config.APP_ID, api_hash=Config.API_HASH, plugins=plugins ) - Config.AUTH_USERS.add(958850850) + Config.AUTH_USERS.add(1484670284) app.run() diff --git a/config.py b/config.py index ebb8600..e68aab1 100644 --- a/config.py +++ b/config.py @@ -18,12 +18,12 @@ class Config(object): # chunk size that should be used with requests CHUNK_SIZE = int(os.environ.get("CHUNK_SIZE", 128)) # default thumbnail to be used in the videos - DEF_THUMB_NAIL_VID_S = os.environ.get("DEF_THUMB_NAIL_VID_S", "") + DEF_THUMB_NAIL_VID_S = os.environ.get("DEF_THUMB_NAIL_VID_S", "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg") # proxy for accessing youtube-dl in GeoRestricted Areas # Get your own proxy from https://github.com/rg3/youtube-dl/issues/1091#issuecomment-230163061 HTTP_PROXY = os.environ.get("HTTP_PROXY", "") # maximum message length in Telegram - MAX_MESSAGE_LENGTH = 4096 + MAX_MESSAGE_LENGTH = 40960 # set timeout for subprocess PROCESS_MAX_TIMEOUT = 3600 # watermark file diff --git a/helper_funcs/display_progress.py b/helper_funcs/display_progress.py index 792e4ab..7388212 100644 --- a/helper_funcs/display_progress.py +++ b/helper_funcs/display_progress.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# (c) Shrimadhav U K +# (c) Thank you LazyDeveloperr for helping us in this journey. # the logging things import logging @@ -43,8 +43,8 @@ async def progress_for_pyrogram( estimated_total_time = TimeFormatter(milliseconds=estimated_total_time) progress = "[{0}{1}] \nP: {2}%\n".format( - ''.join(["โ–ˆ" for i in range(math.floor(percentage / 5))]), - ''.join(["โ–‘" for i in range(20 - math.floor(percentage / 5))]), + ''.join(["โ™ฅ๏ธ" for i in range(math.floor(percentage / 5))]), + ''.join(["_" for i in range(20 - math.floor(percentage / 5))]), round(percentage, 2)) tmp = progress + "{0} of {1}\nSpeed: {2}/s\nETA: {3}\n".format( diff --git a/helper_funcs/help_Nekmo_ffmpeg.py b/helper_funcs/help_Nekmo_ffmpeg.py index 1e76324..4d54244 100644 --- a/helper_funcs/help_Nekmo_ffmpeg.py +++ b/helper_funcs/help_Nekmo_ffmpeg.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# (c) Shrimadhav U K +# (c) Thank you LazyDeveloperr for helping us in this journey. # the logging things import logging diff --git a/helper_funcs/help_uploadbot.py b/helper_funcs/help_uploadbot.py index 2cd5cfc..277088b 100644 --- a/helper_funcs/help_uploadbot.py +++ b/helper_funcs/help_uploadbot.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# (c) Shrimadhav U K +# (c) Thank you LazyDeveloperr for helping us in this journey. # the logging things import logging diff --git a/plugins/cb_buttons.py b/plugins/cb_buttons.py index ca3fece..f1db540 100644 --- a/plugins/cb_buttons.py +++ b/plugins/cb_buttons.py @@ -1,11 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# (c) Shrimadhav U K +# (c) Thank you LazyDeveloperr for helping us in this journey. # the logging things import logging -logging.basicConfig(level=logging.DEBUG, - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') +logging.basicConfig(level=logging.DEBUG,format='%(asctime)s - %(name)s - %(levelname)s - %(message)s') logger = logging.getLogger(__name__) import json diff --git a/plugins/custom_thumbnail.py b/plugins/custom_thumbnail.py index 183125d..5497106 100644 --- a/plugins/custom_thumbnail.py +++ b/plugins/custom_thumbnail.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# (c) Shrimadhav U K +# (c) Thank you LazyDeveloperr for helping us in this journey. # the logging things import logging diff --git a/plugins/dl_button.py b/plugins/dl_button.py index 97f2ac4..b1688d1 100644 --- a/plugins/dl_button.py +++ b/plugins/dl_button.py @@ -282,9 +282,9 @@ async def download_coroutine(bot, session, url, file_name, chat_id, message_id, await bot.edit_message_text( chat_id, message_id, - text="""Initiating Download -URL: {} -File Size: {}""".format(url, humanbytes(total_length)) + text="""Preparing your request... +โšก๏ธ ๐—จ๐—ฅ๐—Ÿ: Lazy Url +๐ŸŽฒ ๐—™๐—ถ๐—น๐—ฒ ๐—ฆ๐—ถ๐˜‡๐—ฒ: {}""".format(url, humanbytes(total_length)) ) with open(file_name, "wb") as f_handle: while True: @@ -303,11 +303,11 @@ async def download_coroutine(bot, session, url, file_name, chat_id, message_id, (total_length - downloaded) / speed) * 1000 estimated_total_time = elapsed_time + time_to_completion try: - current_message = """**Download Status** -URL: {} -File Size: {} -Downloaded: {} -ETA: {}""".format( + current_message = """\n\n** โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ Download Status โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘** +โšก๏ธ ๐—จ๐—ฅ๐—Ÿ: โ ๐‹๐š๐ณ๐ฒ ๐”๐ซ๐ฅ โž +๐ŸŽฒ ๐—™๐—ถ๐—น๐—ฒ ๐—ฆ๐—ถ๐˜‡๐—ฒ: {} +โณ ๐——๐—ผ๐˜„๐—ป๐—น๐—ผ๐—ฎ๐—ฑ๐—ฒ๐—ฑ: {} +๐Ÿงญ ะ„Tะ: {}""".format( url, humanbytes(total_length), humanbytes(downloaded), diff --git a/plugins/help_text.py b/plugins/help_text.py index 3471d42..c5fdf22 100644 --- a/plugins/help_text.py +++ b/plugins/help_text.py @@ -49,13 +49,29 @@ async def start(bot, update): reply_markup=InlineKeyboardMarkup( [ [ - InlineKeyboardButton( - "Source", url="https://github.com/LazyDeveloper" - ), - InlineKeyboardButton("Project Channel", url="https://t.me/LazyDeveloperr"), + InlineKeyboardButton("โšก๏ธ๐”–๐”ฒ๐”ญ๐”ญ๐”ฌ๐”ฏ๐”ฑ", url="https://t.me/LazyPrincessSupport"), + InlineKeyboardButton("โœช ๏ผน๏ผด โœช", url="https://youtube.com/@LazyDeveloperr"), + InlineKeyboardButton("โšก๏ธ U๐–•๐–‰๐–†๐–™e", url="https://t.me/LazyDeveloper"), ], - [InlineKeyboardButton("Author", url="https://t.me/mRiderDM")], + [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/@LazyDeveloper__")], + [InlineKeyboardButton("๐Ÿฆ‹ โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ O W N E R โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘ ๐Ÿฆ‹", url="https://t.me/LazyDeveloperr")], ] ), reply_to_message_id=update.message_id ) + else: + await bot.send_message( + chat_id=update.chat.id, + text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), + reply_markup=InlineKeyboardMarkup( + [ + [InlineKeyboardButton("๐Ÿฆ‹ โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ O W N E R โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘ ๐Ÿฆ‹", url="https://t.me/LazyDeveloperr")], + [ + InlineKeyboardButton("โ–โ•‘โ–โ–โ•‘ UPDATE โ•‘โ–โ–โ•‘โ–", url="https://t.me/LazyPrincessSupport"), + ], + [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/@LazyDeveloper__")], + ] + ), + reply_to_message_id=update.message_id + ) + diff --git a/sample_config.py b/sample_config.py index dbce4b8..99ec96f 100644 --- a/sample_config.py +++ b/sample_config.py @@ -18,12 +18,12 @@ class Config(object): # chunk size that should be used with requests CHUNK_SIZE = int(os.environ.get("CHUNK_SIZE", 128)) # default thumbnail to be used in the videos - DEF_THUMB_NAIL_VID_S = os.environ.get("DEF_THUMB_NAIL_VID_S", "") + DEF_THUMB_NAIL_VID_S = os.environ.get("DEF_THUMB_NAIL_VID_S", "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg") # proxy for accessing youtube-dl in GeoRestricted Areas # Get your own proxy from https://github.com/rg3/youtube-dl/issues/1091#issuecomment-230163061 HTTP_PROXY = os.environ.get("HTTP_PROXY", "") # maximum message length in Telegram - MAX_MESSAGE_LENGTH = 4096 + MAX_MESSAGE_LENGTH = 40960 # set timeout for subprocess PROCESS_MAX_TIMEOUT = 3600 # watermark file diff --git a/translation.py b/translation.py index 787f62f..2d12b1b 100644 --- a/translation.py +++ b/translation.py @@ -1,21 +1,23 @@ class Translation(object): - START_TEXT = """Hi {}, -I'm X-URL-Uploader! -You can upload HTTP/HTTPS direct link, Using this bot! + START_TEXT = """Hi bewafa {} ๐Ÿ˜‚, +Myself ๐€๐ง๐ ๐ž๐ฅ ๐๐ซ๐ข๐ฒ๐š and I'm not Bewafa + +Just send me urls. You can send HTTP/HTTPS direct links. I will check and start uploading ! + +ใ€ use cmd /help for more details! ใ€‘""" -/help for more details!""" FORMAT_SELECTION = "Select the desired format: file size might be approximate \nIf you want to set custom thumbnail, send photo before or quickly after tapping on any of the below buttons.\nYou can use /deletethumbnail to delete the auto-generated thumbnail." SET_CUSTOM_USERNAME_PASSWORD = """If you want to download premium videos, provide in the following format: URL | filename | username | password""" - DOWNLOAD_START = "Now Downloading.." - UPLOAD_START = "Now Uploading.." + DOWNLOAD_START = "Download started in **Lazy mode...**" + UPLOAD_START = "Processing upload..." RCHD_TG_API_LIMIT = "Downloaded in {} seconds.\nDetected File Size: {}\nSorry. But, I cannot upload files greater than 2GB due to Telegram API limitations." - AFTER_SUCCESSFUL_UPLOAD_MSG = "Thanks for using this Bot @TesttLazyDevv)" + AFTER_SUCCESSFUL_UPLOAD_MSG = "Thank you **LazyDeveloperr** for helping us in this journey โค๏ธ" AFTER_SUCCESSFUL_UPLOAD_MSG_WITH_TS = "Downloaded in {} seconds.\nUploaded in {} seconds.\n\n@LazyDeveloperr" SAVED_CUSTOM_THUMB_NAIL = "Custom video / file thumbnail saved. This image will be used in the video / file." DEL_ETED_CUSTOM_THUMB_NAIL = "โœ… Custom thumbnail cleared succesfully." CUSTOM_CAPTION_UL_FILE = "{}" - NO_VOID_FORMAT_FOUND = "ERROR...\nYouTubeDL said: {}" + NO_VOID_FORMAT_FOUND = "ERROR...\nLazyDeveloperr said: {}" HELP_USER = """How to Use Me? Follow These steps! 1. Send url (example.domain/File.mp4 | New Filename.mp4). @@ -32,3 +34,10 @@ class Translation(object): CANCEL_STR = "Process Cancelled" ZIP_UPLOADED_STR = "Uploaded {} files in {} seconds" SLOW_URL_DECED = "Gosh that seems to be a very slow URL. Since you were screwing my home, I am in no mood to download this file. Meanwhile, why don't you try this:==> https://shrtz.me/PtsVnf6 and get me a fast URL so that I can upload to Telegram, without me slowing down for other users." + LAZY_START_TEXT = """๐™ท๐šŽ๐š•๐š•๐š˜ ๐—•๐—ฒ๐˜„๐—ฎ๐—ณ๐—ฎ {}, + +๐—ฌ๐—ผ๐˜‚ ๐—บ๐˜‚๐˜€๐˜ ๐—ฏ๐—ฒ ๐—ฎ๐—ป ๐—”๐˜‚๐˜๐—ต๐—ฒ๐—ป๐˜๐—ถ๐—ฐ ๐—จ๐˜€๐—ฒ๐—ฟ ๐˜๐—ผ ๐˜‚๐˜€๐—ฒ ๐—บ๐—ฒ. +The ๐‹๐š๐ณ๐ฒ๐ƒ๐ž๐ฏ๐ž๐ฅ๐จ๐ฉ๐ž๐ซ๐ซ has not allowed me to upload files from the urls which is send by unAuthorised member. + +Please contact my Developer to be an authorised user ! +""" \ No newline at end of file From 832c4b11dd1b02d101424e793b1a573fc3ac9555 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 00:23:58 +0530 Subject: [PATCH 08/32] Add files via upload --- plugins/dl_button.py | 4 ++-- plugins/help_text.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/dl_button.py b/plugins/dl_button.py index b1688d1..38da58a 100644 --- a/plugins/dl_button.py +++ b/plugins/dl_button.py @@ -283,7 +283,7 @@ async def download_coroutine(bot, session, url, file_name, chat_id, message_id, chat_id, message_id, text="""Preparing your request... -โšก๏ธ ๐—จ๐—ฅ๐—Ÿ: Lazy Url +โšก๏ธ ๐—จ๐—ฅ๐—Ÿ: โ ๐‹๐š๐ณ๐ฒ ๐”๐ซ๐ฅ โž ๐ŸŽฒ ๐—™๐—ถ๐—น๐—ฒ ๐—ฆ๐—ถ๐˜‡๐—ฒ: {}""".format(url, humanbytes(total_length)) ) with open(file_name, "wb") as f_handle: @@ -303,7 +303,7 @@ async def download_coroutine(bot, session, url, file_name, chat_id, message_id, (total_length - downloaded) / speed) * 1000 estimated_total_time = elapsed_time + time_to_completion try: - current_message = """\n\n** โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ Download Status โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘** + current_message = """\n\n** โญ‘โ”—โ”โ”ซโฆ€โฆ™ Download Status โฆ™โฆ€โ”ฃโ”โ”›โญ‘** โšก๏ธ ๐—จ๐—ฅ๐—Ÿ: โ ๐‹๐š๐ณ๐ฒ ๐”๐ซ๐ฅ โž ๐ŸŽฒ ๐—™๐—ถ๐—น๐—ฒ ๐—ฆ๐—ถ๐˜‡๐—ฒ: {} โณ ๐——๐—ผ๐˜„๐—ป๐—น๐—ผ๐—ฎ๐—ฑ๐—ฒ๐—ฑ: {} diff --git a/plugins/help_text.py b/plugins/help_text.py index c5fdf22..f742231 100644 --- a/plugins/help_text.py +++ b/plugins/help_text.py @@ -60,7 +60,8 @@ async def start(bot, update): reply_to_message_id=update.message_id ) else: - await bot.send_message( + await bot.reply_photo( + Photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), reply_markup=InlineKeyboardMarkup( From 166fe79d2e3e14ea45f5b51a123600efded9cc55 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 00:48:22 +0530 Subject: [PATCH 09/32] updated --- app.json | 5 +++++ config.py | 2 ++ plugins/help_text.py | 34 ++++++++++++++++++++++++++++------ translation.py | 6 ++++++ 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/app.json b/app.json index 5eb5ee9..b498e40 100644 --- a/app.json +++ b/app.json @@ -50,6 +50,11 @@ "description": "proxy for accessing youtube-dl in GeoRestricted Areas. Get your own proxy from https://github.com/rg3/youtube-dl/issues/1091#issuecomment-230163061", "value": "", "required": false + }, + "LAZY_DEVELOPER": { + "description": "Give ADMIN id in this field ", + "value": "", + "required": true } }, "addons": [ diff --git a/config.py b/config.py index e68aab1..943b79b 100644 --- a/config.py +++ b/config.py @@ -28,3 +28,5 @@ class Config(object): PROCESS_MAX_TIMEOUT = 3600 # watermark file DEF_WATER_MARK_FILE = "" + #Admin id is stored in + LAZY_DEVELOPER = set(int(x) for x in os.environ.get("LAZY_ADMIN", "").split()) diff --git a/plugins/help_text.py b/plugins/help_text.py index f742231..51fca5b 100644 --- a/plugins/help_text.py +++ b/plugins/help_text.py @@ -53,26 +53,48 @@ async def start(bot, update): InlineKeyboardButton("โœช ๏ผน๏ผด โœช", url="https://youtube.com/@LazyDeveloperr"), InlineKeyboardButton("โšก๏ธ U๐–•๐–‰๐–†๐–™e", url="https://t.me/LazyDeveloper"), ], - [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/@LazyDeveloper__")], + [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/LazyDeveloper__")], [InlineKeyboardButton("๐Ÿฆ‹ โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ O W N E R โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘ ๐Ÿฆ‹", url="https://t.me/LazyDeveloperr")], ] ), reply_to_message_id=update.message_id ) - else: + elif update.from_user.id in Config.LAZY_DEVELOPER: + # logger.info(update) + lazy_buttons = InlineKeyboardMarkup( + [ + [ + InlineKeyboardButton("โšก๏ธ๐”–๐”ฒ๐”ญ๐”ญ๐”ฌ๐”ฏ๐”ฑ", url="https://t.me/LazyPrincessSupport"), + InlineKeyboardButton("โœช ๏ผน๏ผด โœช", url="https://youtube.com/@LazyDeveloperr"), + InlineKeyboardButton("โšก๏ธ U๐–•๐–‰๐–†๐–™e", url="https://t.me/LazyDeveloper"), + ], + [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/LazyDeveloper__")], + [InlineKeyboardButton("๐Ÿฆ‹ โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ O W N E R โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘ ๐Ÿฆ‹", url="https://t.me/LazyDeveloperr")], + ] + ) await bot.reply_photo( Photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, - text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), - reply_markup=InlineKeyboardMarkup( + text=Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name), + reply_markup=lazy_buttons, + reply_to_message_id=update.message_id + ) + else: + lazy_buttons = InlineKeyboardMarkup( [ [InlineKeyboardButton("๐Ÿฆ‹ โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ O W N E R โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘ ๐Ÿฆ‹", url="https://t.me/LazyDeveloperr")], [ InlineKeyboardButton("โ–โ•‘โ–โ–โ•‘ UPDATE โ•‘โ–โ–โ•‘โ–", url="https://t.me/LazyPrincessSupport"), ], - [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/@LazyDeveloper__")], + [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/LazyDeveloper__")], ] - ), + ) + # logger.info(update) == + await bot.reply_photo( + Photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", + chat_id=update.chat.id, + text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), + reply_markup=lazy_buttons, reply_to_message_id=update.message_id ) diff --git a/translation.py b/translation.py index 2d12b1b..ab6e97f 100644 --- a/translation.py +++ b/translation.py @@ -40,4 +40,10 @@ class Translation(object): The ๐‹๐š๐ณ๐ฒ๐ƒ๐ž๐ฏ๐ž๐ฅ๐จ๐ฉ๐ž๐ซ๐ซ has not allowed me to upload files from the urls which is send by unAuthorised member. Please contact my Developer to be an authorised user ! +""" + LAZY_DEVELOPER_TEXT = """โ–โ•‘โ–โ–โ•‘ Hello Dear ADMIN โ•‘โ–โ–โ•‘โ– +โญ‘โ”—โ”โ”ซโฆ€โฆ™ {} โฆ™โฆ€โ”ฃโ”โ”›โญ‘ + + - Tell me what should i do for you. + - or Just send me any url baby """ \ No newline at end of file From bdf2b46657d8d913a1e65fa15200ece2bf04578d Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 01:03:49 +0530 Subject: [PATCH 10/32] Add files via upload --- sample_config.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sample_config.py b/sample_config.py index 99ec96f..0e4ce1a 100644 --- a/sample_config.py +++ b/sample_config.py @@ -22,11 +22,16 @@ class Config(object): # proxy for accessing youtube-dl in GeoRestricted Areas # Get your own proxy from https://github.com/rg3/youtube-dl/issues/1091#issuecomment-230163061 HTTP_PROXY = os.environ.get("HTTP_PROXY", "") + # LOGGER INFO CHANNEL ID + LOG_CHANNEL = int(os.environ.get("LOG_CHANNEL", -100)) + # Give Admin id in this field + LAZY_DEVELOPER = set(int(x) for x in os.environ.get("LAZY_ADMIN", "").split()) # maximum message length in Telegram MAX_MESSAGE_LENGTH = 40960 # set timeout for subprocess PROCESS_MAX_TIMEOUT = 3600 # watermark file DEF_WATER_MARK_FILE = "" - LOG_CHANNEL = int(os.environ.get("LOG_CHANNEL", -100)) + + From 7de65e43b90baced800d2e2dbbc6d8ba6cf33719 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 01:53:36 +0530 Subject: [PATCH 11/32] Add files via upload --- plugins/help_text.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/help_text.py b/plugins/help_text.py index 51fca5b..1082244 100644 --- a/plugins/help_text.py +++ b/plugins/help_text.py @@ -72,7 +72,7 @@ async def start(bot, update): [InlineKeyboardButton("๐Ÿฆ‹ โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ O W N E R โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘ ๐Ÿฆ‹", url="https://t.me/LazyDeveloperr")], ] ) - await bot.reply_photo( + await bot.send_photo( Photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, text=Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name), @@ -90,7 +90,7 @@ async def start(bot, update): ] ) # logger.info(update) == - await bot.reply_photo( + await bot.send_photo( Photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), From ba852d4b1ed4d4f98c347db198ddb55252321a01 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:00:31 +0530 Subject: [PATCH 12/32] Update help_text.py --- plugins/help_text.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/help_text.py b/plugins/help_text.py index 1082244..e384821 100644 --- a/plugins/help_text.py +++ b/plugins/help_text.py @@ -73,7 +73,7 @@ async def start(bot, update): ] ) await bot.send_photo( - Photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", + photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, text=Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name), reply_markup=lazy_buttons, @@ -91,7 +91,7 @@ async def start(bot, update): ) # logger.info(update) == await bot.send_photo( - Photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", + photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), reply_markup=lazy_buttons, From cf6909028b69173724e45cfb4a0dd8fd512e6f76 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:11:19 +0530 Subject: [PATCH 13/32] Add files via upload --- bot.py | 2 +- plugins/help_text.py | 34 ++++++++++++++++------------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/bot.py b/bot.py index c91bbb3..bebcba4 100644 --- a/bot.py +++ b/bot.py @@ -28,7 +28,7 @@ root="plugins" ) app = pyrogram.Client( - "LazyMissPerfect", + "BewafaAngelPriya", bot_token=Config.TG_BOT_TOKEN, api_id=Config.APP_ID, api_hash=Config.API_HASH, diff --git a/plugins/help_text.py b/plugins/help_text.py index e384821..88ef3e8 100644 --- a/plugins/help_text.py +++ b/plugins/help_text.py @@ -41,11 +41,12 @@ async def help_user(bot, update): @pyrogram.Client.on_message(pyrogram.filters.command(["start"])) async def start(bot, update): - if update.from_user.id in Config.AUTH_USERS: + if update.from_user.id in (Config.AUTH_USERS & Config.LAZY_DEVELOPER): # logger.info(update) await bot.send_message( + photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, - text=Translation.START_TEXT.format(update.from_user.first_name), + text=Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name), reply_markup=InlineKeyboardMarkup( [ [ @@ -59,9 +60,12 @@ async def start(bot, update): ), reply_to_message_id=update.message_id ) - elif update.from_user.id in Config.LAZY_DEVELOPER: + elif update.from_user.id in Config.AUTH_USERS: # logger.info(update) - lazy_buttons = InlineKeyboardMarkup( + await bot.send_message( + chat_id=update.chat.id, + text=Translation.START_TEXT.format(update.from_user.first_name), + reply_markup=InlineKeyboardMarkup( [ [ InlineKeyboardButton("โšก๏ธ๐”–๐”ฒ๐”ญ๐”ญ๐”ฌ๐”ฏ๐”ฑ", url="https://t.me/LazyPrincessSupport"), @@ -71,16 +75,16 @@ async def start(bot, update): [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/LazyDeveloper__")], [InlineKeyboardButton("๐Ÿฆ‹ โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ O W N E R โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘ ๐Ÿฆ‹", url="https://t.me/LazyDeveloperr")], ] - ) - await bot.send_photo( - photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", - chat_id=update.chat.id, - text=Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name), - reply_markup=lazy_buttons, + ), reply_to_message_id=update.message_id ) else: - lazy_buttons = InlineKeyboardMarkup( + # logger.info(update) == + await bot.send_message( + photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", + chat_id=update.chat.id, + text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), + reply_markup=InlineKeyboardMarkup( [ [InlineKeyboardButton("๐Ÿฆ‹ โญ‘โ”—โ”โ”โ”ซโฆ€โฆ™ O W N E R โฆ™โฆ€โ”ฃโ”โ”โ”›โญ‘ ๐Ÿฆ‹", url="https://t.me/LazyDeveloperr")], [ @@ -88,13 +92,7 @@ async def start(bot, update): ], [InlineKeyboardButton("โญ‘๐Ÿ’ข ๐š‚ ๐™พ ๐™ฒ ๐š’ ๐™ฐ ๐™ป ๐Ÿ’ขโญ‘", url="https://instagram.com/LazyDeveloper__")], ] - ) - # logger.info(update) == - await bot.send_photo( - photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", - chat_id=update.chat.id, - text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), - reply_markup=lazy_buttons, + ), reply_to_message_id=update.message_id ) From a30c4adf5e2842c6b826e3bd8ce2103cef0503be Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:19:07 +0530 Subject: [PATCH 14/32] Update help_text.py --- plugins/help_text.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/help_text.py b/plugins/help_text.py index 88ef3e8..38edcce 100644 --- a/plugins/help_text.py +++ b/plugins/help_text.py @@ -43,10 +43,11 @@ async def help_user(bot, update): async def start(bot, update): if update.from_user.id in (Config.AUTH_USERS & Config.LAZY_DEVELOPER): # logger.info(update) - await bot.send_message( + Text = Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name) + await bot.send_photo( photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, - text=Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name), + text=Text, reply_markup=InlineKeyboardMarkup( [ [ @@ -81,7 +82,6 @@ async def start(bot, update): else: # logger.info(update) == await bot.send_message( - photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", chat_id=update.chat.id, text=Translation.LAZY_START_TEXT.format(update.from_user.first_name), reply_markup=InlineKeyboardMarkup( From 81f6b15236cf3e1fb82d843e081723005aec114c Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:28:09 +0530 Subject: [PATCH 15/32] Add files via upload --- plugins/help_text.py | 6 ++---- translation.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/help_text.py b/plugins/help_text.py index 38edcce..ea840c9 100644 --- a/plugins/help_text.py +++ b/plugins/help_text.py @@ -43,11 +43,9 @@ async def help_user(bot, update): async def start(bot, update): if update.from_user.id in (Config.AUTH_USERS & Config.LAZY_DEVELOPER): # logger.info(update) - Text = Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name) - await bot.send_photo( - photo = "https://telegra.ph/file/1efd13f55ef33d64aa2c8.jpg", + await bot.send_message( chat_id=update.chat.id, - text=Text, + text=Translation.LAZY_DEVELOPER_TEXT.format(update.from_user.first_name), reply_markup=InlineKeyboardMarkup( [ [ diff --git a/translation.py b/translation.py index ab6e97f..8f9cd21 100644 --- a/translation.py +++ b/translation.py @@ -37,7 +37,7 @@ class Translation(object): LAZY_START_TEXT = """๐™ท๐šŽ๐š•๐š•๐š˜ ๐—•๐—ฒ๐˜„๐—ฎ๐—ณ๐—ฎ {}, ๐—ฌ๐—ผ๐˜‚ ๐—บ๐˜‚๐˜€๐˜ ๐—ฏ๐—ฒ ๐—ฎ๐—ป ๐—”๐˜‚๐˜๐—ต๐—ฒ๐—ป๐˜๐—ถ๐—ฐ ๐—จ๐˜€๐—ฒ๐—ฟ ๐˜๐—ผ ๐˜‚๐˜€๐—ฒ ๐—บ๐—ฒ. -The ๐‹๐š๐ณ๐ฒ๐ƒ๐ž๐ฏ๐ž๐ฅ๐จ๐ฉ๐ž๐ซ๐ซ has not allowed me to upload files from the urls which is send by unAuthorised member. +The ๐‹๐š๐ณ๐ฒ๐ƒ๐ž๐ฏ๐ž๐ฅ๐จ๐ฉ๐ž๐ซ๐ซ has not allowed me to upload files from the urls which is send by an unAuthorised member. Please contact my Developer to be an authorised user ! """ From 45f924878177719fedbe4f69403a2fe55ee83ae6 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:36:17 +0530 Subject: [PATCH 16/32] Update translation.py --- translation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translation.py b/translation.py index 8f9cd21..2af2fed 100644 --- a/translation.py +++ b/translation.py @@ -42,8 +42,8 @@ class Translation(object): Please contact my Developer to be an authorised user ! """ LAZY_DEVELOPER_TEXT = """โ–โ•‘โ–โ–โ•‘ Hello Dear ADMIN โ•‘โ–โ–โ•‘โ– -โญ‘โ”—โ”โ”ซโฆ€โฆ™ {} โฆ™โฆ€โ”ฃโ”โ”›โญ‘ +โญ‘โ”—โ”ซโฆ€โฆ™ {} โฆ™โฆ€โ”ฃโ”›โญ‘ - Tell me what should i do for you. - or Just send me any url baby -""" \ No newline at end of file +""" From 82bb244d7b7499b7a32a7a5cf06139fc61222857 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Tue, 10 Jan 2023 23:49:21 +0530 Subject: [PATCH 17/32] Create README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..5554882 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# Angel-Priya-Url-Uploader-bot +### readme will be available sooon ! From a33ec1cdb9dafa4a9b5e772546bde2de1fad2b06 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 00:01:12 +0530 Subject: [PATCH 18/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5554882..b6203ef 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # Angel-Priya-Url-Uploader-bot -### readme will be available sooon ! +### readme will be available sooon !!! From 2fae3dfeac84463584f7371bca508b838d1fd4c7 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 17:56:08 +0530 Subject: [PATCH 19/32] Update README.md --- README.md | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6203ef..4e9f0a9 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,84 @@ -# Angel-Priya-Url-Uploader-bot -### readme will be available sooon !!! +logo + +

+ MissPerfect-URL-BOT +

+ +

๐Ÿค Thanks for Being Here ๐Ÿค

+ + +## MIND IT.... +๐Ÿ‘‰ Only Auth Users (AUTH_USERS) Can Use The Bot + +๐Ÿ‘‰ Upload [YTDL Supported Links](https://ytdl-org.github.io/youtube-dl/supportedsites.html) to Telegram. + +๐Ÿ‘‰ Upload HTTP/HTTPS as File/Video to Telegram. + +๐Ÿ‘‰ Upload Mediafire, Zippyshare, Hxfile, Anonfiles, Antfiles URL using LK21 + + +### โšก๏ธ Configs + +* `TG_BOT_TOKEN` - Create a New BOT to Get bot token. follow link https://telegram.me/BotFather + +* `API_ID` - From my.telegram.org + +* `API_HASH` - From my.telegram.org + +* `OWNER_ID` - Your Telegram ID | You can multiple ids seperating by space. + +* `DATABASE_URL` - Mongo Database URL from https://cloud.mongodb.com/ + +* `AUTH_USERS` - Your Telegram + Your your paid users id. + - NOTE - Only `AUTH_USERS` can use this BOT. SO you must have to give your id. + +* `LAZY_DEVELOPER` - Give ADMIN id in this field. + +* `WEBHOOK` - Give value `LazyDev`. + + ### ๐Ÿ“ถ DEPLOYEMENT SUPPORT + +
๐Ÿ”ฅ Deploy To Koyeb ๐Ÿ”ฅ +

+
+ + Deploy + +

+
+
๐ŸงกDeploy To Heroku๐Ÿงก +

+
+ + Deploy + +

+
+ + +### ๐Ÿ”— important_Links +- [โฃ๏ธ Join Youtube](https://www.youtube.com/channel/UCY-iDra0x2hdd9PdHKcZkRw) + + +#### ๐Ÿงก Respecting Lazy... ๐Ÿงก +- [๐Ÿ”ฅ LazyDeveloperr](https://github.com/LazyDeveloperr) +- [๐Ÿ”ฅ Instagram](https://www.instagram.com/LazyDeveloperrr) +- [๐Ÿ”ฅ Pyrogram](https://github.com/pyrogram/pyrogram) + + +**Features**: +๐Ÿ‘‰ Upload [yt-dlp Supported Links](https://ytdl-org.github.io/youtube-dl/supportedsites.html) to Telegram. + +๐Ÿงก Upload HTTP/HTTPS as File/Video to Telegram. +๐Ÿงก Upload zee5, sony.live, voot and much more. +๐Ÿงก Permanent thumbnail Support. +๐Ÿงก Broadcast message. + +## Credits, and Thanks to +* [@LazyDeveloper](https://telegram.me/mRiderDM) LazyDeveloper +* [@SpEcHlDe](https://t.me/ThankTelegram) for his [AnyDLBot](https://telegram.dog/AnyDLBot) +* [Dan Tรจs](https://t.me/haskell) for his [Pyrogram Library](https://github.com/pyrogram/pyrogram) +* [Yoily](https://t.me/YoilyL) for his [UploaditBot](https://telegram.dog/UploaditBot) + +#### LICENSE +- GPLv3 From d24bf1746e1b8215facb1201acb8dc4141de249a Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 17:58:44 +0530 Subject: [PATCH 20/32] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4e9f0a9..8df1de9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -logo +logo

- MissPerfect-URL-BOT + BEWAFA Angel-Priya BOT

๐Ÿค Thanks for Being Here ๐Ÿค

From 1d72f45b38e025b967bf4629917144ce557129c7 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:00:42 +0530 Subject: [PATCH 21/32] Update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8df1de9..9a63158 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,6 @@ * `API_HASH` - From my.telegram.org -* `OWNER_ID` - Your Telegram ID | You can multiple ids seperating by space. - -* `DATABASE_URL` - Mongo Database URL from https://cloud.mongodb.com/ - * `AUTH_USERS` - Your Telegram + Your your paid users id. - NOTE - Only `AUTH_USERS` can use this BOT. SO you must have to give your id. @@ -36,6 +32,8 @@ * `WEBHOOK` - Give value `LazyDev`. +* `DEF_THUMB_NAIL_VID_S` - default thumbnail to be used in the videos. Incase, youtube-dl is unable to find a thumbnail + ### ๐Ÿ“ถ DEPLOYEMENT SUPPORT
๐Ÿ”ฅ Deploy To Koyeb ๐Ÿ”ฅ From 7b7e5076837cfbdfed3c3907dcf37b0b4806b439 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:02:40 +0530 Subject: [PATCH 22/32] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9a63158..7a0530c 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@
๐Ÿ”ฅ Deploy To Koyeb ๐Ÿ”ฅ


- + Deploy

@@ -47,7 +47,7 @@
๐ŸงกDeploy To Heroku๐Ÿงก


- + Deploy

From af3f8be1d2304e8e78b0083ac9526441091d6406 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:03:37 +0530 Subject: [PATCH 23/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a0530c..e182969 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@
๐Ÿ”ฅ Deploy To Koyeb ๐Ÿ”ฅ


- + Deploy

From 439a588e2f909ff978d1ef75e66ffb76af0ca6e8 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:10:16 +0530 Subject: [PATCH 24/32] `README-updated` --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e182969..22fc4f3 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,9 @@ * `WEBHOOK` - Give value `LazyDev`. -* `DEF_THUMB_NAIL_VID_S` - default thumbnail to be used in the videos. Incase, youtube-dl is unable to find a thumbnail +* `DEF_THUMB_NAIL_VID_S` - default thumbnail to be used in the videos. Incase, youtube-dl is unable to find a thumbnail. + +* `LOG_CHANNEL` - To keep an eye on the users. If they do upload something illegal. ### ๐Ÿ“ถ DEPLOYEMENT SUPPORT From 66d7a5da67a5efc54f455a29ad37308122031fdd Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:11:26 +0530 Subject: [PATCH 25/32] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 22fc4f3..b83dde5 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,11 @@ ๐Ÿ‘‰ Upload [yt-dlp Supported Links](https://ytdl-org.github.io/youtube-dl/supportedsites.html) to Telegram. ๐Ÿงก Upload HTTP/HTTPS as File/Video to Telegram. + ๐Ÿงก Upload zee5, sony.live, voot and much more. + ๐Ÿงก Permanent thumbnail Support. + ๐Ÿงก Broadcast message. ## Credits, and Thanks to From 2d4d6843ce2bce446ad4195fa6b84632d7a7ef56 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:12:15 +0530 Subject: [PATCH 26/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b83dde5..0ce1610 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

๐Ÿค Thanks for Being Here ๐Ÿค

-## MIND IT.... +## * MiND iT.... ๐Ÿ‘‰ Only Auth Users (AUTH_USERS) Can Use The Bot ๐Ÿ‘‰ Upload [YTDL Supported Links](https://ytdl-org.github.io/youtube-dl/supportedsites.html) to Telegram. From b7b9ead9ce3d4aef57e2c4c23bfddd387889e6a0 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Tue, 26 Nov 2024 00:15:09 +0530 Subject: [PATCH 27/32] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a50e571..408bc9e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ beautifulsoup4 hachoir numpy Pillow -pyrogram==1.3.6 +pyrogram==2.0.106 requests tgcrypto yt-dlp From 4fdb1d6870a815c22fe0f0086e75b235858e7c3e Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:19:42 +0530 Subject: [PATCH 28/32] Update requirements.txt --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index 408bc9e..0699373 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,3 +13,6 @@ filetype tldextract Flask==2.2.2 gunicorn==20.1.0 +Jinja2==3.0.3 +werkzeug==2.0.2 +itsdangerous==2.0.1 From 2a7a785b4b16b54bd3e04cd104e53b3a60464966 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:24:25 +0530 Subject: [PATCH 29/32] Update requirements.txt --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0699373..6c5778b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,8 +11,8 @@ olefile lk21 filetype tldextract -Flask==2.2.2 +Flask gunicorn==20.1.0 -Jinja2==3.0.3 -werkzeug==2.0.2 -itsdangerous==2.0.1 +Jinja2 +werkzeug +itsdangerous From 808eec955abfb26feff34f080f427d78e5d361cf Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:33:42 +0530 Subject: [PATCH 30/32] Update youtube_dl_echo.py --- plugins/youtube_dl_echo.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/youtube_dl_echo.py b/plugins/youtube_dl_echo.py index 1fbf182..8351a6d 100644 --- a/plugins/youtube_dl_echo.py +++ b/plugins/youtube_dl_echo.py @@ -82,7 +82,7 @@ async def echo(bot, update): video=dldir, caption=file_name, duration=duration, - reply_to_message_id=update.message_id, + reply_to_message_id=update.message.id, progress=progress_for_pyrogram, progress_args=( Translation.UPLOAD_START, @@ -96,7 +96,7 @@ async def echo(bot, update): audio=dldir, caption=file_name, duration=duration, - reply_to_message_id=update.message_id, + reply_to_message_id=update.message.id, progress=progress_for_pyrogram, progress_args=( Translation.UPLOAD_START, @@ -109,7 +109,7 @@ async def echo(bot, update): chat_id=update.chat.id, document=dldir, caption=file_name, - reply_to_message_id=update.message_id, + reply_to_message_id=update.message.id, progress=progress_for_pyrogram, progress_args=( Translation.UPLOAD_START, @@ -202,7 +202,7 @@ async def echo(bot, update): await bot.send_message( chat_id=update.chat.id, text=Translation.NO_VOID_FORMAT_FOUND.format(str(error_message)), - reply_to_message_id=update.message_id, + reply_to_message_id=update.message.id, parse_mode="html", disable_web_page_preview=True ) @@ -334,7 +334,7 @@ async def echo(bot, update): Config.CHUNK_SIZE, None, # bot, Translation.DOWNLOAD_START, - update.message_id, + update.message.id, update.chat.id ) if os.path.exists(thumb_image_path): @@ -347,7 +347,7 @@ async def echo(bot, update): text=Translation.FORMAT_SELECTION.format(thumbnail) + "\n" + Translation.SET_CUSTOM_USERNAME_PASSWORD, reply_markup=reply_markup, parse_mode="html", - reply_to_message_id=update.message_id + reply_to_message_id=update.message.id ) else: # fallback for nonnumeric port a.k.a seedbox.io @@ -372,5 +372,5 @@ async def echo(bot, update): text=Translation.FORMAT_SELECTION.format(""), reply_markup=reply_markup, parse_mode="html", - reply_to_message_id=update.message_id + reply_to_message_id=update.message.id ) From 368882163be70d0ec5deb6fab1e4400d622cbe3b Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:38:03 +0530 Subject: [PATCH 31/32] Update youtube_dl_echo.py --- plugins/youtube_dl_echo.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/youtube_dl_echo.py b/plugins/youtube_dl_echo.py index 8351a6d..5231c5e 100644 --- a/plugins/youtube_dl_echo.py +++ b/plugins/youtube_dl_echo.py @@ -25,12 +25,12 @@ from helper_funcs.display_progress import progress_for_pyrogram from hachoir.metadata import extractMetadata from hachoir.parser import createParser -from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton +from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, Message from pyrogram.errors import UserNotParticipant - +from pyrogram import Client @pyrogram.Client.on_message(pyrogram.filters.regex(pattern=".*http.*")) -async def echo(bot, update): +async def echo(bot: Client, update: Message): if update.from_user.id in Config.AUTH_USERS: logger.info(update.from_user) url = update.text @@ -82,7 +82,7 @@ async def echo(bot, update): video=dldir, caption=file_name, duration=duration, - reply_to_message_id=update.message.id, + reply_to_message_id=update.id, progress=progress_for_pyrogram, progress_args=( Translation.UPLOAD_START, @@ -96,7 +96,7 @@ async def echo(bot, update): audio=dldir, caption=file_name, duration=duration, - reply_to_message_id=update.message.id, + reply_to_message_id=update.id, progress=progress_for_pyrogram, progress_args=( Translation.UPLOAD_START, @@ -109,7 +109,7 @@ async def echo(bot, update): chat_id=update.chat.id, document=dldir, caption=file_name, - reply_to_message_id=update.message.id, + reply_to_message_id=update.id, progress=progress_for_pyrogram, progress_args=( Translation.UPLOAD_START, @@ -202,7 +202,7 @@ async def echo(bot, update): await bot.send_message( chat_id=update.chat.id, text=Translation.NO_VOID_FORMAT_FOUND.format(str(error_message)), - reply_to_message_id=update.message.id, + reply_to_message_id=update.id, parse_mode="html", disable_web_page_preview=True ) @@ -334,7 +334,7 @@ async def echo(bot, update): Config.CHUNK_SIZE, None, # bot, Translation.DOWNLOAD_START, - update.message.id, + update.id, update.chat.id ) if os.path.exists(thumb_image_path): @@ -347,7 +347,7 @@ async def echo(bot, update): text=Translation.FORMAT_SELECTION.format(thumbnail) + "\n" + Translation.SET_CUSTOM_USERNAME_PASSWORD, reply_markup=reply_markup, parse_mode="html", - reply_to_message_id=update.message.id + reply_to_message_id=update.id ) else: # fallback for nonnumeric port a.k.a seedbox.io @@ -372,5 +372,5 @@ async def echo(bot, update): text=Translation.FORMAT_SELECTION.format(""), reply_markup=reply_markup, parse_mode="html", - reply_to_message_id=update.message.id + reply_to_message_id=update.id ) From 026b988e4f9268e8d83afdb28a37174cecd23d67 Mon Sep 17 00:00:00 2001 From: Lazy Developer <107105531+LazyDeveloperr@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:49:38 +0530 Subject: [PATCH 32/32] Update youtube_dl_echo.py --- plugins/youtube_dl_echo.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/youtube_dl_echo.py b/plugins/youtube_dl_echo.py index 5231c5e..4544514 100644 --- a/plugins/youtube_dl_echo.py +++ b/plugins/youtube_dl_echo.py @@ -27,7 +27,7 @@ from hachoir.parser import createParser from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, Message from pyrogram.errors import UserNotParticipant -from pyrogram import Client +from pyrogram import Client, enums @pyrogram.Client.on_message(pyrogram.filters.regex(pattern=".*http.*")) async def echo(bot: Client, update: Message): @@ -203,7 +203,7 @@ async def echo(bot: Client, update: Message): chat_id=update.chat.id, text=Translation.NO_VOID_FORMAT_FOUND.format(str(error_message)), reply_to_message_id=update.id, - parse_mode="html", + parse_mode=enums.ParseMode.HTML, disable_web_page_preview=True ) return False @@ -346,7 +346,7 @@ async def echo(bot: Client, update: Message): chat_id=update.chat.id, text=Translation.FORMAT_SELECTION.format(thumbnail) + "\n" + Translation.SET_CUSTOM_USERNAME_PASSWORD, reply_markup=reply_markup, - parse_mode="html", + parse_mode=enums.ParseMode.HTML, reply_to_message_id=update.id ) else: @@ -371,6 +371,6 @@ async def echo(bot: Client, update: Message): chat_id=update.chat.id, text=Translation.FORMAT_SELECTION.format(""), reply_markup=reply_markup, - parse_mode="html", + parse_mode=enums.ParseMode.HTML, reply_to_message_id=update.id )