diff --git a/README.md b/README.md index 1e1cd37..2bda341 100644 --- a/README.md +++ b/README.md @@ -225,7 +225,7 @@ docker-compose -f worker.yml up -d # Command -```cmd +``` start - Let's start about - What's this bot? ping - Bot running status diff --git a/requirements.txt b/requirements.txt index 3cad522..c750248 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,4 +19,4 @@ requests==2.28.0 tqdm==4.64.0 requests-toolbelt==0.9.1 ffpb==0.4.1 -youtube-search-python==1.6.6 +youtube-search-python==1.6.6 \ No newline at end of file diff --git a/ytdlbot/constant.py b/ytdlbot/constant.py index 9ad45d2..bc8ceec 100644 --- a/ytdlbot/constant.py +++ b/ytdlbot/constant.py @@ -8,8 +8,6 @@ __author__ = "Benny " import os -import pathlib -import re import time from config import (AFD_LINK, COFFEE_LINK, ENABLE_CELERY, ENABLE_VIP, EX, @@ -151,7 +149,3 @@ Sending format: **{1}** text += f"{status}{hostname} **{active}** {load} {rev}\n" return text - - -with open(pathlib.Path(__file__).parent.parent.joinpath("README.md"), encoding="u8") as f: - COMMANDS = re.findall(r"```cmd([\s|\S]*)```", f.read())[0].strip() diff --git a/ytdlbot/ytdl_bot.py b/ytdlbot/ytdl_bot.py index f241548..5797687 100644 --- a/ytdlbot/ytdl_bot.py +++ b/ytdlbot/ytdl_bot.py @@ -15,19 +15,18 @@ import time import traceback import typing from io import BytesIO - +from youtubesearchpython import VideosSearch import pyrogram.errors from apscheduler.schedulers.background import BackgroundScheduler from pyrogram import Client, filters, types from pyrogram.errors.exceptions.bad_request_400 import UserNotParticipant from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup from tgbot_ping import get_runtime -from youtubesearchpython import VideosSearch from client_init import create_app from config import (AUTHORIZED_USER, ENABLE_CELERY, ENABLE_VIP, OWNER, REQUIRED_MEMBERSHIP) -from constant import COMMANDS, BotText +from constant import BotText from db import InfluxDB, MySQL, Redis from limit import VIP, verify_payment from tasks import app as celery_app @@ -388,13 +387,4 @@ By @BennyThink, VIP mode: {ENABLE_VIP}, Distribution: {ENABLE_CELERY} Version: {get_revision()} """ print(banner) - - with app: - commands = [i for i in COMMANDS.split("\n") if i] - command_list = [] - for cmd in commands: - split = cmd.split("-") - command_list.append(pyrogram.types.BotCommand(split[0].strip(), split[1].strip())) - app.set_bot_commands(command_list) - app.run()