Skip to content

Commit

Permalink
few changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Chizuru committed Nov 13, 2020
1 parent 1ec4052 commit 22e38bb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 8 additions & 5 deletions bot/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
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
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
Expand All @@ -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
Expand Down Expand Up @@ -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)

Expand Down
Empty file added emails.txt
Empty file.
5 changes: 5 additions & 0 deletions heroku.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
build:
docker:
worker: Dockerfile
run:
worker: bash start.sh
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

0 comments on commit 22e38bb

Please sign in to comment.