diff --git a/Dockerfile b/Dockerfile index 1c9c325..2537f0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,6 @@ RUN apt-get -qq update && \ curl pv jq ffmpeg \ p7zip-full p7zip-rar COPY requirements.txt . -COPY extract /usr/local/bin -RUN chmod +x /usr/local/bin/extract RUN pip3 install --no-cache-dir -r requirements.txt && \ apt-get -qq purge git diff --git a/bot/__main__.py b/bot/__main__.py index bc432bb..3b8e3ce 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -2,10 +2,10 @@ import shutil, psutil import signal import pickle -from os import execl, path, remove +from os import execl, kill, path, remove from sys import executable import time - +from telegram import ParseMode from telegram.ext import CommandHandler, run_async from bot import dispatcher, updater, botStartTime from bot.helper.ext_utils import fs_utils @@ -13,7 +13,7 @@ from bot.helper.telegram_helper.bot_commands import BotCommands from bot.helper.telegram_helper.message_utils import * from .helper.ext_utils.bot_utils import get_readable_file_size, get_readable_time from .helper.telegram_helper.filters import CustomFilters -from .modules import authorize, list, cancel_mirror, mirror_status, mirror, clone, watch +from .modules import authorize, list, cancel_mirror, mirror_status, mirror, clone, watch, shell, eval, anime, stickers @run_async @@ -37,10 +37,10 @@ def stats(update, context): @run_async def start(update, context): start_string = f''' -This is a bot which can mirror all your links to Google drive! +Hi, I'm Ayanami, a multipurpose bot for [Dank-del](t.me/dank_as_fuck) Type /{BotCommands.HelpCommand} to get a list of available commands ''' - sendMessage(start_string, context.bot, update) + update.effective_message.reply_photo("https://telegra.ph/file/87b7878ee9d6273af566f.jpg", start_string, parse_mode=ParseMode.MARKDOWN) @run_async @@ -93,6 +93,9 @@ def bot_help(update, context): /{BotCommands.LogCommand}: Get a log file of the bot. Handy for getting crash reports +/weebhelp - get help for anime, manga and character module. + +/stickerhelp - get help for stickers module. ''' sendMessage(help_string, context.bot, update) diff --git a/emails.txt b/emails.txt new file mode 100644 index 0000000..e69de29 diff --git a/heroku.yml b/heroku.yml new file mode 100644 index 0000000..75581ef --- /dev/null +++ b/heroku.yml @@ -0,0 +1,5 @@ +build: + docker: + worker: Dockerfile +run: + worker: bash start.sh \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 01a7bb3..e833e61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,7 @@ requests psutil +bs4 +Pillow>=4.2.0 python-telegram-bot==12.6.1 google-api-python-client>=1.7.11,<1.7.20 google-auth-httplib2>=0.0.3,<0.1.0 @@ -11,4 +13,4 @@ python-magic beautifulsoup4>=4.8.2,<4.8.10 Pyrogram>=0.16.0,<0.16.10 TgCrypto>=1.1.1,<1.1.10 -youtube_dl +git+https://gitea.eponym.info/Mirrors/youtube-dl