diff --git a/README.md b/README.md index 308106eea35..9256a373aef 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ [![Slam](https://telegra.ph/file/db03910496f06094f1f7a.jpg)](https://youtu.be/Pk_TthHfLeE) # Slam Mirror Bot -![GitHub Repo stars](https://img.shields.io/github/stars/Slam-Team/slam-mirrorbot?color=blue&style=flat) -![GitHub forks](https://img.shields.io/github/forks/Slam-Team/slam-mirrorbot?color=green&style=flat) -![GitHub contributors](https://img.shields.io/github/contributors/Slam-Team/slam-mirrorbot?style=flat) -![GitHub watchers](https://img.shields.io/github/watchers/Slam-Team/slam-mirrorbot) +![GitHub Repo stars](https://img.shields.io/github/stars/SlamDevs/slam-mirrorbot?color=blue&style=flat) +![GitHub forks](https://img.shields.io/github/forks/SlamDevs/slam-mirrorbot?color=green&style=flat) +![GitHub contributors](https://img.shields.io/github/contributors/SlamDevs/slam-mirrorbot?style=flat) +![GitHub watchers](https://img.shields.io/github/watchers/SlamDevs/slam-mirrorbot) ![Docker Pulls](https://img.shields.io/docker/pulls/breakdowns/mega-sdk-python?label=Docker%20Pull) [![Channel](https://img.shields.io/badge/Join%20Channel-!-red)](https://t.me/SlamMirrorUpdates) @@ -16,7 +16,7 @@ ## Additional Features - qBittorrent supported -- Updater (**NOTE**: You must upload your **token.pickle** to Index and fill your **token.pickle** url to **TOKEN_PICKLE_URL**, because your **token.pickle** will deleted after update, for more info please check [Setting up config file](https://github.com/Slam-Team/slam-mirrorbot/tree/master#setting-up-config-file)) +- Updater (**NOTE**: You must upload your **token.pickle** to Index and fill your **token.pickle** url to **TOKEN_PICKLE_URL**, because your **token.pickle** will deleted after update, for more info please check [Setting up config file](https://github.com/SlamDevs/slam-mirrorbot/tree/master#setting-up-config-file)) - Limiting size Torrent/Direct, Tar/Unzip, Mega, cloning Google Drive support - Stop duplicate cloning Google Drive & mirroring Mega support - Tar/Unzip Google Drive link support @@ -76,7 +76,7 @@ Deploying is pretty much straight forward and is divided into several steps as f - Clone this repo: ``` -git clone https://github.com/Slam-Team/slam-mirrorbot mirrorbot/ +git clone https://github.com/SlamDevs/slam-mirrorbot mirrorbot/ cd mirrorbot ``` @@ -135,16 +135,16 @@ Fill up rest of the fields. Meaning of each fields are discussed below: - **DOWNLOAD_DIR**: The path to the local folder where the downloads should be downloaded to - **DOWNLOAD_STATUS_UPDATE_INTERVAL**: A short interval of time in seconds after which the Mirror progress message is updated. (I recommend to keep it `5` seconds at least) - **AUTO_DELETE_MESSAGE_DURATION**: Interval of time (in seconds), after which the bot deletes it's message (and command message) which is expected to be viewed instantly. (**Note**: Set to `-1` to never automatically delete messages) -- **UPSTREAM_REPO**: Link for Bot Upstream Repo, if you want default update, fill `https://github.com/Slam-Team/slam-mirrorbot`. +- **UPSTREAM_REPO**: Link for Bot Upstream Repo, if you want default update, fill `https://github.com/SlamDevs/slam-mirrorbot`. - **UPSTREAM_BRANCH**: Branch name for Bot Upstream Repo, fill `master`. ### Optional Field - **ACCOUNTS_ZIP_URL**: Only if you want to load your Service Account externally from an Index Link. Archive the accounts folder to a zip file. Fill this with the direct link of that file. - **TOKEN_PICKLE_URL**: Only if you want to load your **token.pickle** externally from an Index Link. Fill this with the direct link of that file. -- **DATABASE_URL**: Your Database URL. See [Generate Database](https://github.com/Slam-Team/slam-mirrorbot/tree/master#generate-database) to generate database (**NOTE**: If you use database you can save your sudo id permanent using `/addsudo` command). +- **DATABASE_URL**: Your Database URL. See [Generate Database](https://github.com/SlamDevs/slam-mirrorbot/tree/master#generate-database) to generate database (**NOTE**: If you use database you can save your sudo id permanent using `/addsudo` command). - **AUTHORIZED_CHATS**: Fill user_id and chat_id (not username) of you want to authorize, Seprate them with space, Examples: `-0123456789 -1122334455 6915401739`. - **SUDO_USERS**: Fill user_id (not username) of you want to sudoers, Seprate them with space, Examples: `0123456789 1122334455 6915401739` (**NOTE**: If you want save sudo id permanent without database, you must fill your sudo id there). - **IS_TEAM_DRIVE**: Set to `True` if `GDRIVE_FOLDER_ID` is from a Team Drive else `False` or Leave it empty. -- **USE_SERVICE_ACCOUNTS**: (Leave empty if unsure) Whether to use Service Accounts or not. For this to work see [Using Service Accounts](https://github.com/Slam-Team/slam-mirrorbot#generate-service-accounts-what-is-service-account) section below. +- **USE_SERVICE_ACCOUNTS**: (Leave empty if unsure) Whether to use Service Accounts or not. For this to work see [Using Service Accounts](https://github.com/SlamDevs/slam-mirrorbot#generate-service-accounts-what-is-service-account) section below. - **INDEX_URL**: Refer to https://gitlab.com/ParveenBhadooOfficial/Google-Drive-Index The URL should not have any trailing '/' - **MEGA_API_KEY**: Mega.nz api key to mirror mega.nz links. Get it from [Mega SDK Page](https://mega.nz/sdk) - **MEGA_EMAIL_ID**: Your email id you used to sign up on mega.nz for using premium accounts (Leave th) @@ -215,7 +215,7 @@ sudo docker run mirrorbot ``` ## Deploying on Heroku with Github Workflow -

+

## Deploying on Heroku with heroku-cli and Goorm IDE

@@ -285,7 +285,7 @@ python3 gen_sa_accounts.py --download-keys project_id python3 add_to_team_drive.py -d SharedTeamDriveSrcID ``` -# Youtube-dl authentication using [.netrc](https://github.com/Slam-Team/slam-mirrorbot/blob/master/.netrc) file +# Youtube-dl authentication using [.netrc](https://github.com/SlamDevs/slam-mirrorbot/blob/master/.netrc) file For using your premium accounts in Youtube-dl or for protected Index Links, edit the netrc file according to following format: ``` machine host login username password my_youtube_password @@ -310,4 +310,4 @@ Thanks to: - [zevtyardt](https://github.com/zevtyardt) for some direct links - [yash-dk](https://github.com/yash-dk) for implementation qBittorrent on Python -And many more people who aren't mentioned here, but may be found in [Contributors](https://github.com/Slam-Team/slam-mirrorbot/graphs/contributors). +And many more people who aren't mentioned here, but may be found in [Contributors](https://github.com/SlamDevs/slam-mirrorbot/graphs/contributors). diff --git a/alive.py b/alive.py index bf692976c1f..53d8b13f5bb 100644 --- a/alive.py +++ b/alive.py @@ -1,5 +1,5 @@ -# Implement By - @anasty17 (https://github.com/Slam-Team/slam-mirrorbot/commit/0bfba523f095ab1dccad431d72561e0e002e7a59) -# (c) https://github.com/Slam-Team/slam-mirrorbot +# Implement By - @anasty17 (https://github.com/SlamDevs/slam-mirrorbot/commit/0bfba523f095ab1dccad431d72561e0e002e7a59) +# (c) https://github.com/SlamDevs/slam-mirrorbot # All rights reserved import time diff --git a/bot/__main__.py b/bot/__main__.py index 02c0471b3f2..c8df62ee7ac 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -49,7 +49,7 @@ def start(update, context): Type /{BotCommands.HelpCommand} to get a list of available commands ''' buttons = button_build.ButtonMaker() - buttons.buildbutton("Repo", "https://github.com/Slam-Team/slam-mirrorbot") + buttons.buildbutton("Repo", "https://github.com/SlamDevs/slam-mirrorbot") buttons.buildbutton("Channel", "https://t.me/SlamMirrorUpdates") reply_markup = InlineKeyboardMarkup(buttons.build_menu(2)) if CustomFilters.authorized_user(update) or CustomFilters.authorized_chat(update): 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 3428eb96b9b..d6cc0441df4 100644 --- a/bot/helper/mirror_utils/download_utils/direct_link_generator.py +++ b/bot/helper/mirror_utils/download_utils/direct_link_generator.py @@ -209,7 +209,7 @@ def github(url: str) -> str: def hxfile(url: str) -> str: """ Hxfile direct link generator Based on https://github.com/zevtyardt/lk21 - https://github.com/Slam-Team/slam-mirrorbot """ + https://github.com/SlamDevs/slam-mirrorbot """ bypasser = lk21.Bypass() dl_url=bypasser.bypass_filesIm(url) return dl_url @@ -218,7 +218,7 @@ def hxfile(url: str) -> str: def anonfiles(url: str) -> str: """ Anonfiles direct link generator Based on https://github.com/zevtyardt/lk21 - https://github.com/Slam-Team/slam-mirrorbot """ + https://github.com/SlamDevs/slam-mirrorbot """ bypasser = lk21.Bypass() dl_url=bypasser.bypass_anonfiles(url) return dl_url @@ -227,7 +227,7 @@ def anonfiles(url: str) -> str: def letsupload(url: str) -> str: """ Letsupload direct link generator Based on https://github.com/zevtyardt/lk21 - https://github.com/Slam-Team/slam-mirrorbot """ + https://github.com/SlamDevs/slam-mirrorbot """ dl_url = '' try: link = re.findall(r'\bhttps?://.*letsupload\.io\S+', url)[0] @@ -241,7 +241,7 @@ def letsupload(url: str) -> str: def fembed(link: str) -> str: """ Fembed direct link generator Based on https://github.com/zevtyardt/lk21 - https://github.com/Slam-Team/slam-mirrorbot """ + https://github.com/SlamDevs/slam-mirrorbot """ bypasser = lk21.Bypass() dl_url=bypasser.bypass_fembed(link) lst_link = [] @@ -254,7 +254,7 @@ def fembed(link: str) -> str: def sbembed(link: str) -> str: """ Sbembed direct link generator Based on https://github.com/zevtyardt/lk21 - https://github.com/Slam-Team/slam-mirrorbot """ + https://github.com/SlamDevs/slam-mirrorbot """ bypasser = lk21.Bypass() dl_url=bypasser.bypass_sbembed(link) lst_link = [] @@ -295,7 +295,7 @@ def pixeldrain(url: str) -> str: def antfiles(url: str) -> str: """ Antfiles direct link generator Based on https://github.com/zevtyardt/lk21 - https://github.com/breakdowns/slam-mirrorbot """ + https://github.com/SlamDevs/slam-mirrorbot """ bypasser = lk21.Bypass() dl_url=bypasser.bypass_antfiles(url) return dl_url @@ -304,7 +304,7 @@ def antfiles(url: str) -> str: def streamtape(url: str) -> str: """ Streamtape direct link generator Based on https://github.com/zevtyardt/lk21 - https://github.com/Slam-Team/slam-mirrorbot """ + https://github.com/SlamDevs/slam-mirrorbot """ bypasser = lk21.Bypass() dl_url=bypasser.bypass_streamtape(url) return dl_url @@ -312,7 +312,7 @@ def streamtape(url: str) -> str: def racaty(url: str) -> str: """ Racaty direct links generator - based on https://github.com/Slam-Team/slam-mirrorbot """ + based on https://github.com/SlamDevs/slam-mirrorbot """ dl_url = '' try: link = re.findall(r'\bhttps?://.*racaty\.net\S+', url)[0] @@ -332,7 +332,7 @@ def racaty(url: str) -> str: def fichier(link: str) -> str: """ 1Fichier direct links generator Based on https://github.com/Maujar - https://github.com/Slam-Team/slam-mirrorbot """ + https://github.com/SlamDevs/slam-mirrorbot """ regex = r"^([http:\/\/|https:\/\/]+)?.*1fichier\.com\/\?.+" gan = re.match(regex, link) if not gan: diff --git a/bot/helper/mirror_utils/download_utils/qbit_downloader.py b/bot/helper/mirror_utils/download_utils/qbit_downloader.py index b6172cb6ef4..71bb157a30d 100644 --- a/bot/helper/mirror_utils/download_utils/qbit_downloader.py +++ b/bot/helper/mirror_utils/download_utils/qbit_downloader.py @@ -1,5 +1,5 @@ -# Implement By - @anasty17 (https://github.com/Slam-Team/slam-mirrorbot/commit/0bfba523f095ab1dccad431d72561e0e002e7a59) -# (c) https://github.com/Slam-Team/slam-mirrorbot +# Implement By - @anasty17 (https://github.com/SlamDevs/slam-mirrorbot/commit/0bfba523f095ab1dccad431d72561e0e002e7a59) +# (c) https://github.com/SlamDevs/slam-mirrorbot # All rights reserved import os diff --git a/bot/helper/mirror_utils/status_utils/clone_status.py b/bot/helper/mirror_utils/status_utils/clone_status.py index eb1c8dfdfee..e15d31566e7 100644 --- a/bot/helper/mirror_utils/status_utils/clone_status.py +++ b/bot/helper/mirror_utils/status_utils/clone_status.py @@ -1,5 +1,5 @@ -# Implement By - @anasty17 (https://github.com/Slam-Team/slam-mirrorbot/commit/80d33430715b4296cd253f62cefc089a81937ebf) -# (c) https://github.com/Slam-Team/slam-mirrorbot +# Implement By - @anasty17 (https://github.com/SlamDevs/slam-mirrorbot/commit/80d33430715b4296cd253f62cefc089a81937ebf) +# (c) https://github.com/SlamDevs/slam-mirrorbot # All rights reserved from .status import Status diff --git a/bot/helper/mirror_utils/status_utils/gdownload_status.py b/bot/helper/mirror_utils/status_utils/gdownload_status.py index 02bde134c4a..279a5a72042 100644 --- a/bot/helper/mirror_utils/status_utils/gdownload_status.py +++ b/bot/helper/mirror_utils/status_utils/gdownload_status.py @@ -1,5 +1,5 @@ -# Implement By - @anasty17 (https://github.com/Slam-Team/slam-mirrorbot/pull/220) -# (c) https://github.com/Slam-Team/slam-mirrorbot +# Implement By - @anasty17 (https://github.com/SlamDevs/slam-mirrorbot/pull/220) +# (c) https://github.com/SlamDevs/slam-mirrorbot # All rights reserved from .status import Status diff --git a/bot/helper/mirror_utils/status_utils/qbit_download_status.py b/bot/helper/mirror_utils/status_utils/qbit_download_status.py index 20fe82e7cc9..458c6a760b3 100644 --- a/bot/helper/mirror_utils/status_utils/qbit_download_status.py +++ b/bot/helper/mirror_utils/status_utils/qbit_download_status.py @@ -1,5 +1,5 @@ -# Implement By - @anasty17 (https://github.com/Slam-Team/slam-mirrorbot/commit/0bfba523f095ab1dccad431d72561e0e002e7a59) -# (c) https://github.com/Slam-Team/slam-mirrorbot +# Implement By - @anasty17 (https://github.com/SlamDevs/slam-mirrorbot/commit/0bfba523f095ab1dccad431d72561e0e002e7a59) +# (c) https://github.com/SlamDevs/slam-mirrorbot # All rights reserved from bot import DOWNLOAD_DIR, LOGGER, get_client diff --git a/bot/helper/mirror_utils/upload_utils/gdriveTools.py b/bot/helper/mirror_utils/upload_utils/gdriveTools.py index fa13bfa514b..72c9a71983a 100644 --- a/bot/helper/mirror_utils/upload_utils/gdriveTools.py +++ b/bot/helper/mirror_utils/upload_utils/gdriveTools.py @@ -560,7 +560,7 @@ def edit_telegraph(self): Telegraph(access_token=telegraph_token).edit_page(path = self.path[prev_page], title = 'Slam Mirrorbot Search', author_name='Slam Mirrorbot', - author_url='https://github.com/Slam-Team/slam-mirrorbot', + author_url='https://github.com/SlamDevs/slam-mirrorbot', html_content=content) return @@ -645,7 +645,7 @@ def drive_list(self, fileName): self.path.append(Telegraph(access_token=telegraph_token).create_page( title = 'Slam Mirrorbot Search', author_name='Slam Mirrorbot', - author_url='https://github.com/Slam-Team/slam-mirrorbot', + author_url='https://github.com/SlamDevs/slam-mirrorbot', html_content=content )['path']) diff --git a/bot/modules/count.py b/bot/modules/count.py index cf055e8b23b..a2a5e334991 100644 --- a/bot/modules/count.py +++ b/bot/modules/count.py @@ -1,5 +1,5 @@ -# Implement By - @anasty17 (https://github.com/Slam-Team/slam-mirrorbot/pull/111) -# (c) https://github.com/Slam-Team/slam-mirrorbot +# Implement By - @anasty17 (https://github.com/SlamDevs/slam-mirrorbot/pull/111) +# (c) https://github.com/SlamDevs/slam-mirrorbot # All rights reserved from telegram.ext import CommandHandler diff --git a/config_sample.env b/config_sample.env index aab9ecbc692..77b194d3feb 100644 --- a/config_sample.env +++ b/config_sample.env @@ -11,7 +11,7 @@ AUTO_DELETE_MESSAGE_DURATION = 20 IS_TEAM_DRIVE = "" TELEGRAM_API = TELEGRAM_HASH = "" -UPSTREAM_REPO = "https://github.com/Slam-Team/slam-mirrorbot" +UPSTREAM_REPO = "https://github.com/SlamDevs/slam-mirrorbot" UPSTREAM_BRANCH = "master" # OPTIONAL CONFIG DATABASE_URL = "" @@ -43,7 +43,7 @@ TORRENT_DIRECT_LIMIT = "" TAR_UNZIP_LIMIT = "" CLONE_LIMIT = "" MEGA_LIMIT = "" -# Fill only if you deploying with heroku-cli and Goorm IDE +# Required for Heroku HEROKU_API_KEY = "" HEROKU_APP_NAME = "" # View Link button to open file Index Link in browser instead of direct download link diff --git a/heroku-guide.md b/heroku-guide.md index 98a17a23dde..b7165db2657 100644 --- a/heroku-guide.md +++ b/heroku-guide.md @@ -2,7 +2,7 @@ ## Pre-requisites -- [token.pickle](https://github.com/Slam-Team/slam-mirrorbot#getting-google-oauth-api-credential-file) +- [token.pickle](https://github.com/SlamDevs/slam-mirrorbot#getting-google-oauth-api-credential-file) - [Heroku](heroku.com) accounts - Recommended to use 1 App in 1 Heroku account - Don't use bin/fake credits card, because your Heroku account will get banned. diff --git a/wserver.py b/wserver.py index 88778ff69bc..8824b0d2976 100644 --- a/wserver.py +++ b/wserver.py @@ -205,7 +205,7 @@
- +
@@ -530,7 +530,7 @@
- +
@@ -541,7 +541,7 @@ @@ -696,7 +696,7 @@ async def set_priority(request): await asyncio.sleep(2) if not await re_verfiy(pause, resume, client, torr): - LOGGER.error("The torrent choose errored reverification failed") + LOGGER.error("The Torrent choose errored reverification failed") client.auth_log_out() return await list_torrent_contents(request) @@ -704,7 +704,7 @@ async def set_priority(request): @routes.get('/') async def homepage(request): - return web.Response(text="

See slam-mirrorbot @GitHub By Slam-Team

", content_type="text/html") + return web.Response(text="

See slam-mirrorbot @GitHub By SlamDevs

", content_type="text/html") async def e404_middleware(app, handler):