From 1c04c6f728ff2e3dc61c6cb6746e4bd60296cd56 Mon Sep 17 00:00:00 2001 From: Hafitz Setya Date: Mon, 5 Jul 2021 13:47:15 +0700 Subject: [PATCH] Update msg Signed-off-by: breakdowns --- README.md | 4 ++-- bot/__main__.py | 1 + .../mirror_utils/download_utils/direct_link_generator.py | 2 +- bot/helper/mirror_utils/upload_utils/gdriveTools.py | 2 +- bot/modules/list.py | 2 +- bot/modules/mirror.py | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 923e94a..08b7f47 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ tgx, yts, eztv, torlock, rarbg letsupload.io, hxfile.co, anonfiles.com, fembed.com, fembed.net, femax20.com, layarkacaxxi.icu, fcdn.stream, sbplay.org, naniplay.com, naniplay.nanime.in, naniplay.nanime.biz, sbembed.com, streamsb.net, feurl.com, pixeldrain.com, -uptobox.com (Uptobox account must be premium), -1drv.ms (Only works for file not folder or business account) +1drv.ms (Only works for file not folder or business account), +uptobox.com (Uptobox account must be premium) ``` ## From Original Repos - Mirroring direct download links, Torrent, and Telegram files to Google Drive diff --git a/bot/__main__.py b/bot/__main__.py index e118a77..44f095b 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -183,6 +183,7 @@ def bot_help(update, context): /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: diff --git a/bot/helper/mirror_utils/download_utils/direct_link_generator.py b/bot/helper/mirror_utils/download_utils/direct_link_generator.py index cc22c00..f46fd01 100644 --- a/bot/helper/mirror_utils/download_utils/direct_link_generator.py +++ b/bot/helper/mirror_utils/download_utils/direct_link_generator.py @@ -33,7 +33,7 @@ def direct_link_generator(link: str): if not link: raise DirectDownloadLinkException("`No links found!`") elif 'youtube.com' in link or 'youtu.be' in link: - raise DirectDownloadLinkException(f"Youtube Link use /{BotCommands.WatchCommand} or /{BotCommands.TarWatchCommand}") + raise DirectDownloadLinkException(f"Use /{BotCommands.WatchCommand} to mirror Youtube link\nUse /{BotCommands.TarWatchCommand} to make tar of Youtube playlist") elif 'zippyshare.com' in link: return zippy_share(link) elif 'yadi.sk' in link: diff --git a/bot/helper/mirror_utils/upload_utils/gdriveTools.py b/bot/helper/mirror_utils/upload_utils/gdriveTools.py index 216a768..6a2ce04 100644 --- a/bot/helper/mirror_utils/upload_utils/gdriveTools.py +++ b/bot/helper/mirror_utils/upload_utils/gdriveTools.py @@ -126,7 +126,7 @@ class GoogleDriveHelper: try: file_id = self.getIdFromUrl(link) except (KeyError,IndexError): - msg = "Google drive ID could not be found in the provided link" + msg = "Google Drive ID could not be found in the provided link" return msg msg = '' try: diff --git a/bot/modules/list.py b/bot/modules/list.py index 0a4893a..ef84053 100644 --- a/bot/modules/list.py +++ b/bot/modules/list.py @@ -18,7 +18,7 @@ def list_drive(update, context): if button: editMessage(msg, reply, button) else: - editMessage('No result found', reply, button) + editMessage(f'No result found for {search}', reply, button) except IndexError: sendMessage('Send a search key along with command', context.bot, update) diff --git a/bot/modules/mirror.py b/bot/modules/mirror.py index 3650c06..eebac04 100644 --- a/bot/modules/mirror.py +++ b/bot/modules/mirror.py @@ -292,14 +292,14 @@ def _mirror(bot, update, isTar=False, extract=False): sendMessage(f"{e}", bot, update) return if "Youtube" in str(e): - sendMessage(f"ERROR: {e}", bot, update) + sendMessage(f"{e}", bot, update) return listener = MirrorListener(bot, update, pswd, isTar, tag, extract) if bot_utils.is_gdrive_link(link): if not isTar and not extract: - sendMessage(f"Use /{BotCommands.CloneCommand} To Copy Google Drive File/Folder", bot, update) + sendMessage(f"Use /{BotCommands.CloneCommand} to clone Google Drive file/folder\nUse /{BotCommands.TarMirrorCommand} to make tar of Google Drive folder\nUse /{BotCommands.UnzipMirrorCommand} to extracts archive Google Drive file", bot, update) return res, size, name = gdriveTools.GoogleDriveHelper().clonehelper(link) if res != "":