diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c8a7b2b5d70..fb08d4c5273 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,12 +1 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username ko_fi: breakdowns -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 4dac767cd21..d6b4706d27b 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1,11 @@ blank_issues_enabled: false contact_links: - - name: Slam Mirrorbot Channels + - name: Slam Mirrorbot Channel url: https://t.me/SlamMirrorUpdates - about: Updates Channels + about: Update Channel - name: Slam Mirrorbot Group url: https://t.me/SlamSupport about: Support Group + - name: Bug Report Group + url: https://t.me/SlamBugReport + about: Bug Report & Feature Request Group diff --git a/README.md b/README.md index 0c62f465f3d..8e2da446db7 100644 --- a/README.md +++ b/README.md @@ -170,9 +170,9 @@ Fill up rest of the fields. Meaning of each field is discussed below: - `IS_VPS`: (Only for VPS) Don't set this to `True` even if you are using VPS, unless facing error with web server. - `SERVER_PORT`: Only For VPS even if `IS_VPS` is `False` --> Base URL Port - `BASE_URL_OF_BOT`: (Required for Heroku to avoid sleep/idling) Valid BASE URL of app where the bot is deployed. Format of URL should be `http://myip` (where `myip` is the IP/Domain of your bot) or if you have chosen other port than `80` then fill in this format `http://myip:port`, for Heroku fill `https://yourappname.herokuapp.com` (**NOTE**: Do not put slash at the end), still got idling? You can use http://cron-job.org to ping your Heroku app. -- `RECURSIVE_SEARCH`: Set this to `True` to search in sub-folders with `/list` (**NOTE**: This will only work with shared-drive ID or fill `root` for main drive. Folder IDs are not compatible with it.) +- `RECURSIVE_SEARCH`: Set this to `True` to search in sub-folders with `/list` (**NOTE**: This will only work with Shared-Drive ID or fill `root` for main Drive. Folder IDs are not compatible with it.) - `TG_SPLIT_SIZE`: Size Telegram split, leave it empty for max size `2GB` -- `AS_DOCUMENT`: Should all the upload to telegram be forced as documents or not, set it `True` or `False` +- `AS_DOCUMENT`: Should all the upload to Telegram be forced as documents or not, set it `True` or `False` - `SHORTENER_API`: Fill your Shortener API key if you are using Shortener. - `SHORTENER`: if you want to use Shortener in G-Drive and index link, fill Shortener URL here. Examples: ``` @@ -194,45 +194,7 @@ Three buttons are already added including Drive Link, Index Link, and View Link, ## Bot commands to be set in [@BotFather](https://t.me/BotFather) -``` -help - Get Detailed Help -mirror - Start Mirroring -tarmirror - Start mirroring and upload as .tar -zipmirror - Start mirroring and upload as .zip -unzipmirror - Extract files -qbmirror - Start Mirroring using qBittorrent -qbtarmirror - Start mirroring and upload as .tar using qb -qbzipmirror - Start mirroring and upload as .zip using qb -qbunzipmirror - Extract files using qBittorrent -leech - Leech Torrent/Direct link -tarleech - Leech Torrent/Direct link and upload as .tar -zipleech - Leech Torrent/Direct link and upload as .zip -unzipleech - Leech Torrent/Direct link and extract -qbleech - Leech Torrent/Magnet using qBittorrent -qbtarleech - Leech Torrent/Magnet and upload as .tar using qb -qbzipleech - Leech Torrent/Magnet and upload as .zip using qb -qbunzipleech - Leech Torrent and extract using qb -clone - Copy file/folder to Drive -count - Count file/folder of Drive link -watch - Mirror Youtube-dl supported link -tarwatch - Mirror Youtube playlist link and upload as .tar -zipwatch - Mirror Youtube playlist link and upload as .zip -leechwatch - Leech through Youtube-dl supported link -leechtarwatch - Leech Youtube playlist link and upload as .tar -leechzipwatch - Leech Youtube playlist link and upload as .zip -leechset - Leech settings -setthumb - Set Thumbnail -status - Get Mirror Status message -list - [query] Searches files in Drive -cancel - Cancel a task -cancelall - Cancel all tasks -del - [drive_url] Delete file from Drive -log - Get the Bot Log [owner/sudo only] -shell - Run commands in Shell [owner only] -restart - Restart the Bot [owner/sudo only] -stats - Bot Usage Stats -ping - Ping the Bot -``` +

## Getting Google OAuth API credential file - Visit the [Google Cloud Console](https://console.developers.google.com/apis/credentials) diff --git a/bot/helper/ext_utils/bot_utils.py b/bot/helper/ext_utils/bot_utils.py index c2e7a04c2a3..5d49c31d2fb 100644 --- a/bot/helper/ext_utils/bot_utils.py +++ b/bot/helper/ext_utils/bot_utils.py @@ -135,7 +135,7 @@ def get_readable_message(): MirrorStatus.STATUS_EXTRACTING, MirrorStatus.STATUS_SPLITTING, ]: - msg += f"\n{get_progress_bar_string(download)} {download.progress()}" + msg += f"\n{get_progress_bar_string(download)} {download.progress()}" if download.status() == MirrorStatus.STATUS_CLONING: msg += f"\nCloned: {get_readable_file_size(download.processed_bytes())} of {download.size()}" elif download.status() == MirrorStatus.STATUS_UPLOADING: @@ -153,7 +153,7 @@ def get_readable_message(): f" | Leechers: {download.torrent_info().num_leechs}" except: pass - msg += f"\nTo Stop: /{BotCommands.CancelMirror} {download.gid()}" + msg += f"\nTo Cancel: /{BotCommands.CancelMirror} {download.gid()}" msg += "\n\n" if STATUS_LIMIT is not None and index == STATUS_LIMIT: break diff --git a/bot/helper/custom_filters.py b/bot/helper/ext_utils/custom_filters.py similarity index 100% rename from bot/helper/custom_filters.py rename to bot/helper/ext_utils/custom_filters.py diff --git a/bot/modules/leech_settings.py b/bot/modules/leech_settings.py index fc5eb74cede..f5f2ee7c117 100644 --- a/bot/modules/leech_settings.py +++ b/bot/modules/leech_settings.py @@ -97,7 +97,7 @@ def setThumb(update, context): # img.resize((480, 320)) img.save(des_dir, "JPEG") os.remove(photo_dir) - sendMessage(f"Custom thumbnail saved for {user_id} user.", context.bot, update) + sendMessage(f"Custom thumbnail saved for {user_id} user.", context.bot, update) else: sendMessage("Reply to a photo to save custom thumbnail.", context.bot, update) diff --git a/bot/modules/torrent_search.py b/bot/modules/torrent_search.py index e96618d9dbf..efe6125d628 100644 --- a/bot/modules/torrent_search.py +++ b/bot/modules/torrent_search.py @@ -19,7 +19,7 @@ from pyrogram.handlers import MessageHandler, CallbackQueryHandler from bot import app, dispatcher, bot -from bot.helper import custom_filters +from bot.helper.ext_utils import custom_filters from bot.helper.telegram_helper.bot_commands import BotCommands from bot.helper.telegram_helper.filters import CustomFilters from bot.helper.telegram_helper.message_utils import sendMessage