From 9f8993b8a2bd1c99b513d83212ad3905976779ab Mon Sep 17 00:00:00 2001 From: Hafitz Setya Date: Sat, 3 Jul 2021 08:56:47 +0700 Subject: [PATCH] Update Command Signed-off-by: breakdowns --- README.md | 12 +++---- bot/__main__.py | 78 ++++++++++++++++++++++++------------------- bot/modules/search.py | 12 +++++-- 3 files changed, 58 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 94a60a6..f38b89c 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,12 @@ - Counting file/folder - View Link button - Shell and Executor -- Torrent search supported: +- Torrent search Supported: ``` -nyaasi, sukebei, 1337x, piratebay, tgx, -yts, eztv, torlock, rarbg +nyaa.si, sukebei, 1337x, piratebay, +tgx, yts, eztv, torlock, rarbg ``` -- Direct links supported: +- Direct links Supported: ``` letsupload.io, hxfile.co, anonfiles.com, fembed.com, femax20.com, layarkacaxxi.icu, naniplay.com, naniplay.nanime.in, naniplay.nanime.biz, sbembed.com, streamsb.net, @@ -152,7 +152,7 @@ Fill up rest of the fields. Meaning of each fields are discussed below: - **BLOCK_MEGA_LINKS**: If you want to remove mega.nz mirror support, set it to `True`. - **STOP_DUPLICATE_MIRROR**: (Leave empty if unsure) if this field is set to `True`, bot will check file in Drive, if it is present in Drive, downloading will be stopped. (**Note**: File will be checked using filename, not using filehash, so this feature is not perfect yet) - **STOP_DUPLICATE_MEGA**: (Leave empty if unsure) if this field is set to `True`, bot will check file in Drive, if it is present in Drive, downloading Mega will be stopped. (**Note**: File will be checked using filename, not using filehash, so this feature is not perfect yet) -- **STOP_DUPLICATE_CLONE**: (Leave empty if unsure) if this field is set to `True`, bot will check file in Drive, if it is present in Drive, cloning will be stopped..(**Note**: File will be checked using filename, not using filehash, so this feature is not perfect yet) +- **STOP_DUPLICATE_CLONE**: (Leave empty if unsure) if this field is set to `True`, bot will check file in Drive, if it is present in Drive, cloning will be stopped. (**Note**: File will be checked using filename, not using filehash, so this feature is not perfect yet) - **CLONE_LIMIT**: To limit cloning Google Drive (leave space between number and unit, Available units is (gb or GB, tb or TB). - **MEGA_LIMIT**: To limit downloading Mega (leave space between number and unit, Available units is (gb or GB, tb or TB). - **TORRENT_DIRECT_LIMIT**: To limit the Torrent/Direct mirror size, Leave space between number and unit. Available units is (gb or GB, tb or TB). @@ -162,7 +162,7 @@ Fill up rest of the fields. Meaning of each fields are discussed below: - **UPTOBOX_TOKEN**: Uptobox token to mirror uptobox links. Get it from [Uptobox Premium Account](https://uptobox.com/my_account). - **HEROKU_API_KEY**: (Only if you deploying on Heroku) Your Heroku API key, get it from https://dashboard.heroku.com/account. - **HEROKU_APP_NAME**: (Only if you deploying on Heroku) Your Heroku app name. -- **IGNORE_PENDING_REQUESTS**: (Optional field) If you want the bot to ignore pending requests after it restarts, set this to `True`. +- **IGNORE_PENDING_REQUESTS**: If you want the bot to ignore pending requests after it restarts, set this to `True`. - **SHORTENER_API**: Fill your Shortener api key if you are using Shortener. - **SHORTENER**: if you want to use Shortener in Gdrive and index link, fill Shortener url here. Examples: ``` diff --git a/bot/__main__.py b/bot/__main__.py index ede9b81..e118a77 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -93,30 +93,34 @@ def bot_help(update, context): help_string_adm = f''' /{BotCommands.HelpCommand}: To get this message -/{BotCommands.MirrorCommand} [download_url][magnet_link]: Start mirroring the link to Google Drive. - -/{BotCommands.UnzipMirrorCommand} [download_url][magnet_link]: Starts mirroring and if downloaded file is any archive, extracts it to Google Drive +/{BotCommands.MirrorCommand} [download_url][magnet_link]: Start mirroring the link to Google Drive /{BotCommands.TarMirrorCommand} [download_url][magnet_link]: Start mirroring and upload the archived (.tar) version of the download -/{BotCommands.CloneCommand}: Copy file/folder to Google Drive +/{BotCommands.UnzipMirrorCommand} [download_url][magnet_link]: Starts mirroring and if downloaded file is any archive, extracts it to Google Drive -/{BotCommands.CountCommand}: Count file/folder of Google Drive Links +/{BotCommands.CloneCommand} [drive_url]: Copy file/folder to Google Drive -/{BotCommands.DeleteCommand} [link]: Delete file from Google Drive (Only Owner & Sudo) +/{BotCommands.CountCommand} [drive_url]: Count file/folder of Google Drive Links -/{BotCommands.WatchCommand} [youtube-dl supported link]: Mirror through youtube-dl. Click /{BotCommands.WatchCommand} for more help. +/{BotCommands.DeleteCommand} [drive_url]: Delete file from Google Drive (Only Owner & Sudo) + +/{BotCommands.WatchCommand} [youtube-dl supported link]: Mirror through youtube-dl. Click /{BotCommands.WatchCommand} for more help /{BotCommands.TarWatchCommand} [youtube-dl supported link]: Mirror through youtube-dl and tar before uploading /{BotCommands.CancelMirror}: Reply to the message by which the download was initiated and that download will be cancelled +/{BotCommands.CancelAllCommand}: Cancel all running tasks + +/{BotCommands.ListCommand} [search term]: Searches the search term in the Google Drive, If found replies with the link + /{BotCommands.StatusCommand}: Shows a status of all the downloads -/{BotCommands.ListCommand} [search term]: Searches the search term in the Google Drive, if found replies with the link - /{BotCommands.StatsCommand}: Show Stats of the machine the bot is hosted on +/{BotCommands.PingCommand}: Check how long it takes to Ping the Bot + /{BotCommands.AuthorizeCommand}: Authorize a chat or a user to use the bot (Can only be invoked by Owner & Sudo of the bot) /{BotCommands.UnAuthorizeCommand}: Unauthorize a chat or a user to use the bot (Can only be invoked by Owner & Sudo of the bot) @@ -127,55 +131,58 @@ def bot_help(update, context): /{BotCommands.RmSudoCommand}: Remove sudo users (Only Owner) +/{BotCommands.RestartCommand}: Restart the bot + /{BotCommands.LogCommand}: Get a log file of the bot. Handy for getting crash reports -/{BotCommands.ConfigMenuCommand}: Get Info Menu about bot config (Owner Only). +/{BotCommands.ConfigMenuCommand}: Get Info Menu about bot config (Owner Only) -/{BotCommands.UpdateCommand}: Update Bot from Upstream Repo. (Owner Only). +/{BotCommands.UpdateCommand}: Update Bot from Upstream Repo (Owner Only) -/{BotCommands.UsageCommand}: To see Heroku Dyno Stats (Owner & Sudo only). +/{BotCommands.UsageCommand}: To see Heroku Dyno Stats (Owner & Sudo only) /{BotCommands.SpeedCommand}: Check Internet Speed of the Host -/{BotCommands.MediaInfoCommand}: Get detailed info about replied media (Only for Telegram file). +/{BotCommands.MediaInfoCommand}: Get detailed info about replied media (Only for Telegram file) -/{BotCommands.ShellCommand}: Run commands in Shell (Terminal). +/{BotCommands.ShellCommand}: Run commands in Shell (Terminal) -/tshelp: Get help for Torrent search module. +/tshelp: Get help for Torrent search module ''' help_string = f''' /{BotCommands.HelpCommand}: To get this message -/{BotCommands.MirrorCommand} [download_url][magnet_link]: Start mirroring the link to Google Drive. - -/{BotCommands.UnzipMirrorCommand} [download_url][magnet_link]: Starts mirroring and if downloaded file is any archive, extracts it to Google Drive +/{BotCommands.MirrorCommand} [download_url][magnet_link]: Start mirroring the link to Google Drive /{BotCommands.TarMirrorCommand} [download_url][magnet_link]: Start mirroring and upload the archived (.tar) version of the download -/{BotCommands.CloneCommand}: Copy file/folder to Google Drive +/{BotCommands.UnzipMirrorCommand} [download_url][magnet_link]: Starts mirroring and if downloaded file is any archive, extracts it to Google Drive -/{BotCommands.CountCommand}: Count file/folder of Google Drive Links +/{BotCommands.CloneCommand} [drive_url]: Copy file/folder to Google Drive -/{BotCommands.WatchCommand} [youtube-dl supported link]: Mirror through youtube-dl. Click /{BotCommands.WatchCommand} for more help. +/{BotCommands.CountCommand} [drive_url]: Count file/folder of Google Drive Links + +/{BotCommands.WatchCommand} [youtube-dl supported link]: Mirror through youtube-dl. Click /{BotCommands.WatchCommand} for more help /{BotCommands.TarWatchCommand} [youtube-dl supported link]: Mirror through youtube-dl and tar before uploading /{BotCommands.CancelMirror}: Reply to the message by which the download was initiated and that download will be cancelled -/{BotCommands.StatusCommand}: Shows a status of all the downloads +/{BotCommands.ListCommand} [search term]: Searches the search term in the Google Drive, If found replies with the link -/{BotCommands.ListCommand} [search term]: Searches the search term in the Google Drive, if found replies with the link +/{BotCommands.StatusCommand}: Shows a status of all the downloads /{BotCommands.StatsCommand}: Show Stats of the machine the bot is hosted on +/{BotCommands.PingCommand}: Check how long it takes to Ping the Bot + /{BotCommands.SpeedCommand}: Check Internet Speed of the Host -/{BotCommands.MediaInfoCommand}: Get detailed info about replied media (Only for Telegram file). +/{BotCommands.MediaInfoCommand}: Get detailed info about replied media (Only for Telegram file) -/tshelp: Get help for Torrent search module. +/tshelp: Get help for Torrent search module ''' - if CustomFilters.sudo_user(update) or CustomFilters.owner_filter(update): sendMessage(help_string_adm, context.bot, update) else: @@ -183,24 +190,25 @@ def bot_help(update, context): botcmds = [ +BotCommand(f'{BotCommands.HelpCommand}','Get Detailed Help'), BotCommand(f'{BotCommands.MirrorCommand}', 'Start Mirroring'), -BotCommand(f'{BotCommands.TarMirrorCommand}','Upload tar (zipped) file'), +BotCommand(f'{BotCommands.TarMirrorCommand}','Start mirroring and upload as .tar'), BotCommand(f'{BotCommands.UnzipMirrorCommand}','Extract files'), BotCommand(f'{BotCommands.CloneCommand}','Copy file/folder to Drive'), BotCommand(f'{BotCommands.CountCommand}','Count file/folder of Drive link'), -BotCommand(f'{BotCommands.WatchCommand}','Mirror YT-DL support link'), -BotCommand(f'{BotCommands.TarWatchCommand}','Mirror Youtube playlist link as tar'), +BotCommand(f'{BotCommands.DeleteCommand}','Delete file from Drive'), +BotCommand(f'{BotCommands.WatchCommand}','Mirror Youtube-dl support link'), +BotCommand(f'{BotCommands.TarWatchCommand}','Mirror Youtube playlist link as .tar'), BotCommand(f'{BotCommands.CancelMirror}','Cancel a task'), BotCommand(f'{BotCommands.CancelAllCommand}','Cancel all tasks'), -BotCommand(f'{BotCommands.DeleteCommand}','Delete file from Drive'), -BotCommand(f'{BotCommands.ListCommand}',' [query] Searches files in Drive'), +BotCommand(f'{BotCommands.ListCommand}','Searches files in Drive'), BotCommand(f'{BotCommands.StatusCommand}','Get Mirror Status message'), BotCommand(f'{BotCommands.StatsCommand}','Bot Usage Stats'), -BotCommand(f'{BotCommands.HelpCommand}','Get Detailed Help'), +BotCommand(f'{BotCommands.PingCommand}','Ping the Bot'), +BotCommand(f'{BotCommands.RestartCommand}','Restart the bot [owner/sudo only]'), +BotCommand(f'{BotCommands.LogCommand}','Get the Bot Log [owner/sudo only]'), BotCommand(f'{BotCommands.MediaInfoCommand}','Get detailed info about replied media'), -BotCommand(f'{BotCommands.SpeedCommand}','Check Speed of the host'), -BotCommand(f'{BotCommands.LogCommand}','Bot Log [owner/sudo only]'), -BotCommand(f'{BotCommands.RestartCommand}','Restart bot [owner/sudo only]')] +BotCommand(f'/tshelp','Get help for Torrent search module')] def main(): diff --git a/bot/modules/search.py b/bot/modules/search.py index 6472bb7..6857a57 100644 --- a/bot/modules/search.py +++ b/bot/modules/search.py @@ -71,7 +71,7 @@ async def return_search(query, page=1, sukebei=False): message_info = dict() ignore = set() -@app.on_message(filters.command(['nyaa'])) +@app.on_message(filters.command(['nyaasi'])) async def nyaa_search(client, message): text = message.text.split(' ') text.pop(0) @@ -272,7 +272,13 @@ RESULT_STR_TGX = ( "➲Seeders: {Seeders} || ➲Leechers: {Leechers}" ) RESULT_STR_YTS = ( - "➲Name: `{Name}`" + "➲Name: `{Name}`\n" + "➲Released on: {ReleasedDate}\n" + "➲Genre: {Genre}\n" + "➲Rating: {Rating}\n" + "➲Likes: {Likes}\n" + "➲Duration: {Runtime}\n" + "➲Language: {Language}" ) RESULT_STR_EZTV = ( "➲Name: `{Name}`\n" @@ -312,7 +318,7 @@ for command, value in torrents_dict.items(): def searchhelp(update, context): help_string = ''' -• /nyaa [search query] +• /nyaasi [search query] • /sukebei [search query] • /1337x [search query] • /piratebay [search query]