v4.7.8
- Added custom img in telegraph search - Update user agent - Tidying up
This commit is contained in:
Hafitz Setya
parent
813f2174be
commit
aa6aab2f4c
GPG Key ID:
4AEE18F83AFDEB23
22
README.md
22
README.md
|
|
@ -22,7 +22,7 @@
|
|||
- Nyaa.si and Sukebei Torrent search
|
||||
- Speedtest with picture results
|
||||
- Limiting Torrent size support
|
||||
- Sudo with database support
|
||||
- Sudo with Database support
|
||||
- Check Heroku dynos stats
|
||||
- Custom image support
|
||||
- Racaty.net support
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
- Download/upload progress, speeds and ETAs
|
||||
- Mirror all Youtube-dl supported links
|
||||
- Docker support
|
||||
- Uploading To Team Drive
|
||||
- Uploading to Team Drive
|
||||
- Index Link support
|
||||
- Service Account support
|
||||
- Delete files from Drive
|
||||
|
|
@ -83,7 +83,7 @@ pip3 install -r requirements-cli.txt
|
|||
<summary><b>Click here for more details</b></summary>
|
||||
|
||||
**1. Using ElephantSQL**
|
||||
- Go to https://elephantsql.com/ and create account (skip this if you already have ElephantDB accounti)
|
||||
- Go to https://elephantsql.com/ and create account (skip this if you already have ElephantSQL account)
|
||||
- Hit **Create New Instance**
|
||||
- Follow the further instructions in the screen
|
||||
- Hit **Select Region**
|
||||
|
|
@ -111,19 +111,21 @@ cp config_sample.env config.env
|
|||
_____REMOVE_THIS_LINE_____=True
|
||||
```
|
||||
Fill up rest of the fields. Meaning of each fields are discussed below:
|
||||
### Required field
|
||||
- **BOT_TOKEN**: The Telegram bot token that you get from [@BotFather](https://t.me/BotFather)
|
||||
- **TELEGRAM_API**: This is to authenticate to your Telegram account for downloading Telegram files. You can get this from https://my.telegram.org DO NOT put this in quotes.
|
||||
- **TELEGRAM_HASH**: This is to authenticate to your Telegram account for downloading Telegram files. You can get this from https://my.telegram.org
|
||||
- **OWNER_ID**: The Telegram user ID (not username) of the Owner of the bot
|
||||
- **DATABASE_URL**: Your Database URL. See [Generate Database](https://github.com/breakdowns/slam-mirrorbot/tree/master#generate-database) to generate database. (**NOTE**: If you deploying on Heroku, no need to generate database manually, because it will automatic generate database when first deploying)
|
||||
- **GDRIVE_FOLDER_ID**: This is the folder ID of the Google Drive Folder to which you want to upload all the mirrors.
|
||||
- **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)
|
||||
- **OWNER_ID**: The Telegram user ID (not username) of the Owner of the bot
|
||||
- **AUTHORIZED_CHATS**: Fill user_id and chat_id of you want to authorize.
|
||||
- **DATABASE_URL**: Your Database URL. See [Generate Database](https://github.com/breakdowns/slam-mirrorbot/tree/master#generate-database) to generate database. (**NOTE**: If you deploying on Heroku, no need to generate database manually, because it will automatic generate database)
|
||||
- **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)
|
||||
### Optional field
|
||||
- **AUTHORIZED_CHATS**: Fill user_id and chat_id of you want to authorize.
|
||||
- **IS_TEAM_DRIVE**: (Optional field) Set to `True` if `GDRIVE_FOLDER_ID` is from a Team Drive else `False` or Leave it empty.
|
||||
- **USE_SERVICE_ACCOUNTS**: (Optional field) (Leave empty if unsure) Whether to use Service Accounts or not. For this to work see [Using service accounts](https://github.com/breakdowns/slam-mirrorbot#generate-service-accounts-what-is-service-account) section below.
|
||||
- **INDEX_URL**: (Optional field) Refer to https://github.com/maple3142/GDIndex/ The URL should not have any trailing '/'
|
||||
- **API_KEY**: This is to authenticate to your Telegram account for downloading Telegram files. You can get this from https://my.telegram.org DO NOT put this in quotes.
|
||||
- **API_HASH**: This is to authenticate to your Telegram account for downloading Telegram files. You can get this from https://my.telegram.org
|
||||
- **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)
|
||||
- **MEGA_PASSWORD**: Your password for your mega.nz account
|
||||
|
|
@ -132,10 +134,10 @@ Fill up rest of the fields. Meaning of each fields are discussed below:
|
|||
- **STOP_DUPLICATE_MIRROR**: (Optional field) (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)
|
||||
- **ENABLE_FILESIZE_LIMIT**: Set it to `True` if you want to use `MAX_TORRENT_SIZE`.
|
||||
- **MAX_TORRENT_SIZE**: To limit the Torrent mirror size, Fill The amount you want to limit, examples: if you fill `15` it will limit `15gb`.
|
||||
- **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.
|
||||
- **IMAGE_URL**: (Optional field) Show Image/Logo in /start message. Fill value of image your link image, use telegra.ph or any direct link image.
|
||||
- **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.
|
||||
- **SHORTENER_API**: Fill your Shortener api key if you are using Shortener.
|
||||
- **SHORTENER**: (Optional field) if you want to use Shortener in Gdrive and index link, fill Shortener url here. Examples:
|
||||
```
|
||||
|
|
|
|||
2
aria.sh
2
aria.sh
|
|
@ -8,7 +8,7 @@ aria2c --enable-rpc --rpc-listen-all=false --rpc-listen-port 6800 --check-certif
|
|||
--follow-torrent=mem --split=10 \
|
||||
--daemon=true --allow-overwrite=true --max-overall-download-limit=$MAX_DOWNLOAD_SPEED \
|
||||
--max-overall-upload-limit=1K --max-concurrent-downloads=$MAX_CONCURRENT_DOWNLOADS \
|
||||
--peer-id-prefix=-qB4220- --user-agent=qBittorrent/4.2.2 \
|
||||
--peer-id-prefix=-qB4250- --user-agent=qBittorrent/4.2.5 \
|
||||
--disk-cache=64M --file-allocation=prealloc --continue=true \
|
||||
--max-file-not-found=5 --max-tries=20 --auto-file-renaming=true \
|
||||
--bt-enable-lpd=true --seed-time=0.01 --seed-ratio=1.0 \
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ from telegram import InlineKeyboardMarkup
|
|||
from bot.helper.telegram_helper import button_build
|
||||
from telegraph import Telegraph
|
||||
from bot import parent_id, DOWNLOAD_DIR, IS_TEAM_DRIVE, INDEX_URL, \
|
||||
USE_SERVICE_ACCOUNTS, download_dict, telegraph_token, BUTTON_THREE_NAME, BUTTON_THREE_URL, BUTTON_FOUR_NAME, BUTTON_FOUR_URL, BUTTON_FIVE_NAME, BUTTON_FIVE_URL, SHORTENER, SHORTENER_API
|
||||
USE_SERVICE_ACCOUNTS, download_dict, telegraph_token, BUTTON_THREE_NAME, BUTTON_THREE_URL, BUTTON_FOUR_NAME, BUTTON_FOUR_URL, BUTTON_FIVE_NAME, BUTTON_FIVE_URL, SHORTENER, SHORTENER_API, IMAGE_URL
|
||||
from bot.helper.ext_utils.bot_utils import *
|
||||
from bot.helper.ext_utils.fs_utils import get_mime_type, get_path_size
|
||||
|
||||
|
|
@ -483,7 +483,7 @@ class GoogleDriveHelper:
|
|||
content += f'<b> | <a href="https://telegra.ph/{self.path[nxt_page]}">Next</a></b>'
|
||||
nxt_page += 1
|
||||
Telegraph(access_token=telegraph_token).edit_page(path = self.path[prev_page],
|
||||
title = 'Slam Mirror Bot - Search',
|
||||
title = 'Slam Mirror Bot Search',
|
||||
author_name='Slam Mirror Bot',
|
||||
author_url='https://github.com/breakdowns/slam-mirrorbot',
|
||||
html_content=content)
|
||||
|
|
@ -509,7 +509,7 @@ class GoogleDriveHelper:
|
|||
orderBy='name asc').execute()
|
||||
content_count = 0
|
||||
if response["files"]:
|
||||
msg += f'<h4>{len(response["files"])} Results: {fileName}</h4><br><br>'
|
||||
msg += f'<img src="{IMAGE_URL}" /><h4>{len(response["files"])} Results: {fileName}</h4><br><br>'
|
||||
for file in response.get('files', []):
|
||||
if file.get('mimeType') == "application/vnd.google-apps.folder": # Detect Whether Current Entity is a Folder or File.
|
||||
furl = f"https://drive.google.com/drive/folders/{file.get('id')}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue