1.1.7 я ебал блять писать комиты
This commit is contained in:
Verum
@@ -4,7 +4,7 @@
|
||||
from aiogram import Router, types, F
|
||||
from aiogram.enums import ChatAction
|
||||
from aiogram.filters import Command
|
||||
from aiogram.types import InputMediaPhoto
|
||||
from aiogram.types import InputMediaPhoto, InputMediaVideo, InputMediaDocument
|
||||
|
||||
from BotLibrary import Logs, valid_url, username
|
||||
from ProjectsFiles import BotVar
|
||||
@@ -17,7 +17,7 @@ __all__ = ("CommandHandler",)
|
||||
class CommandHandler:
|
||||
def __init__(self, name: str, keywords: list, func=None, text_msg: str = None, chat_action: bool = False,
|
||||
description: str = "Описание команды", tg_links: bool = False,
|
||||
keyboard=None, prefix=BotVar.prefix, callbackdata=None,
|
||||
keyboard=None, prefix=BotVar.prefix, callbackdata=None, only_admin: bool = False,
|
||||
ignore_case: bool = True, activate_keywoards: bool = True,
|
||||
activate_commands: bool = True, activate_callback: bool = True,
|
||||
media: str = "message", path_to_media=None, parse_mode: str = BotVar.parse_mode,
|
||||
@@ -37,6 +37,7 @@ class CommandHandler:
|
||||
|
||||
self.media = media.lower()
|
||||
self.protect = protect
|
||||
self.only_admin = only_admin
|
||||
self.func = func
|
||||
|
||||
# Поддержка до 10 медиафайлов через список
|
||||
@@ -77,217 +78,277 @@ class CommandHandler:
|
||||
reply_markup=self.keyboard() if self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
has_protected_content=self.protect,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.TYPING,
|
||||
)
|
||||
else:
|
||||
if self.media == "photo" and len(self.path_to_media) > 1:
|
||||
# Отправка медиагруппы для фотографий
|
||||
media_group = []
|
||||
for media_path in self.path_to_media:
|
||||
url = valid_url(media_path)
|
||||
if url:
|
||||
media_group.append(InputMediaPhoto(media=media_path))
|
||||
else:
|
||||
media_group.append(InputMediaPhoto(media=types.FSInputFile(path=media_path)))
|
||||
elif self.media == "photo" and len(self.path_to_media) > 1:
|
||||
# Отправка медиагруппы для фотографий
|
||||
media_group = []
|
||||
for media_path in self.path_to_media:
|
||||
url = valid_url(media_path)
|
||||
if url:
|
||||
media_group.append(InputMediaPhoto(media=media_path))
|
||||
else:
|
||||
media_group.append(InputMediaPhoto(media=types.FSInputFile(path=media_path)))
|
||||
|
||||
# Добавляем подпись и клавиатуру к последнему элементу
|
||||
media_group[-1].caption = self.text_msg
|
||||
media_group[-1].parse_mode = self.parse_mode
|
||||
# Добавляем подпись и клавиатуру к последнему элементу
|
||||
media_group[-1].caption = self.text_msg
|
||||
media_group[-1].parse_mode = self.parse_mode
|
||||
|
||||
await message.reply_media_group(
|
||||
media=media_group,
|
||||
await message.reply_media_group(
|
||||
media=media_group,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
# Отправка клавиатуры отдельным сообщением, если есть
|
||||
if self.keyboard:
|
||||
await message.reply(
|
||||
text=" ",
|
||||
reply_markup=self.keyboard(),
|
||||
disable_notification=self.disable_notification,
|
||||
has_protected_content=self.protect,
|
||||
|
||||
)
|
||||
# Отправка клавиатуры отдельным сообщением, если есть
|
||||
if self.keyboard:
|
||||
await message.reply(
|
||||
text=" ",
|
||||
reply_markup=self.keyboard(),
|
||||
if self.chat_action:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_PHOTO,
|
||||
)
|
||||
elif self.media == "video" and len(self.path_to_media) > 1:
|
||||
# Отправка медиагруппы для видео
|
||||
media_group = []
|
||||
for media_path in self.path_to_media:
|
||||
url = valid_url(media_path)
|
||||
if url:
|
||||
media_group.append(InputMediaVideo(media=media_path))
|
||||
else:
|
||||
media_group.append(InputMediaVideo(media=types.FSInputFile(path=media_path)))
|
||||
|
||||
# Добавляем подпись и клавиатуру к последнему элементу
|
||||
media_group[-1].caption = self.text_msg
|
||||
media_group[-1].parse_mode = self.parse_mode
|
||||
|
||||
await message.reply_media_group(
|
||||
media=media_group,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
# Отправка клавиатуры отдельным сообщением, если есть
|
||||
if self.keyboard:
|
||||
await message.reply(
|
||||
text=" ",
|
||||
reply_markup=self.keyboard(),
|
||||
disable_notification=self.disable_notification,
|
||||
)
|
||||
if self.chat_action:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VIDEO,
|
||||
)
|
||||
elif self.media == "file" and len(self.path_to_media) > 1:
|
||||
# Отправка медиагруппы для файлов
|
||||
media_group = []
|
||||
for media_path in self.path_to_media:
|
||||
url = valid_url(media_path)
|
||||
if url:
|
||||
media_group.append(InputMediaDocument(media=media_path))
|
||||
else:
|
||||
media_group.append(InputMediaDocument(media=types.FSInputFile(path=media_path)))
|
||||
|
||||
# Добавляем подпись и клавиатуру к последнему элементу
|
||||
media_group[-1].caption = self.text_msg
|
||||
media_group[-1].parse_mode = self.parse_mode
|
||||
|
||||
await message.reply_media_group(
|
||||
media=media_group,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
# Отправка клавиатуры отдельным сообщением, если есть
|
||||
if self.keyboard:
|
||||
await message.reply(
|
||||
text=" ",
|
||||
reply_markup=self.keyboard(),
|
||||
disable_notification=self.disable_notification,
|
||||
)
|
||||
if self.chat_action:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_DOCUMENT,
|
||||
)
|
||||
else:
|
||||
# Одиночное медиа или другие типы
|
||||
for idx, media_path in enumerate(self.path_to_media):
|
||||
is_last = idx == len(self.path_to_media) - 1
|
||||
url = valid_url(media_path)
|
||||
|
||||
if self.media == "photo":
|
||||
if url:
|
||||
await message.reply_photo(
|
||||
photo=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_photo(
|
||||
photo=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_PHOTO,
|
||||
)
|
||||
|
||||
elif self.media == "gif":
|
||||
if url:
|
||||
await message.reply_animation(
|
||||
animation=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_animation(
|
||||
animation=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VIDEO,
|
||||
)
|
||||
|
||||
elif self.media == "video":
|
||||
if url:
|
||||
await message.reply_video(
|
||||
video=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_video(
|
||||
video=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VIDEO,
|
||||
)
|
||||
|
||||
elif self.media == "videonote":
|
||||
if url:
|
||||
await message.reply_video_note(
|
||||
video_note=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_video_note(
|
||||
video_note=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VIDEO_NOTE,
|
||||
)
|
||||
|
||||
elif self.media == "audio":
|
||||
if url:
|
||||
await message.reply_audio(
|
||||
audio=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_audio(
|
||||
audio=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VOICE,
|
||||
)
|
||||
|
||||
elif self.media == "file":
|
||||
if url:
|
||||
await message.reply_document(
|
||||
document=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_document(
|
||||
document=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_DOCUMENT,
|
||||
)
|
||||
|
||||
elif self.media == "dice":
|
||||
await message.reply_dice(
|
||||
emoji="🎲", # Эмодзи кубика как стандартное значение, если нет URL
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_PHOTO,
|
||||
)
|
||||
else:
|
||||
# Одиночное медиа или другие типы
|
||||
for idx, media_path in enumerate(self.path_to_media):
|
||||
is_last = idx == len(self.path_to_media) - 1
|
||||
url = valid_url(media_path)
|
||||
|
||||
if self.media == "photo":
|
||||
if url:
|
||||
await message.reply_photo(
|
||||
photo=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_photo(
|
||||
photo=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_PHOTO,
|
||||
)
|
||||
|
||||
elif self.media == "gif":
|
||||
if url:
|
||||
await message.reply_animation(
|
||||
animation=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_animation(
|
||||
animation=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VIDEO,
|
||||
)
|
||||
|
||||
elif self.media == "video":
|
||||
if url:
|
||||
await message.reply_video(
|
||||
video=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_video(
|
||||
video=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VIDEO,
|
||||
)
|
||||
|
||||
elif self.media == "videonote":
|
||||
if url:
|
||||
await message.reply_video_note(
|
||||
video_note=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_video_note(
|
||||
video_note=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VIDEO_NOTE,
|
||||
)
|
||||
|
||||
elif self.media == "audio":
|
||||
if url:
|
||||
await message.reply_audio(
|
||||
audio=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_audio(
|
||||
audio=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_VOICE,
|
||||
)
|
||||
|
||||
elif self.media == "file":
|
||||
if url:
|
||||
await message.reply_document(
|
||||
document=media_path,
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
else:
|
||||
await message.reply_document(
|
||||
document=types.FSInputFile(path=media_path),
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.UPLOAD_DOCUMENT,
|
||||
)
|
||||
|
||||
elif self.media == "dice":
|
||||
await message.reply_dice(
|
||||
emoji="🎲", # Эмодзи кубика как стандартное значение, если нет URL
|
||||
caption=self.text_msg if is_last else None,
|
||||
reply_markup=self.keyboard() if is_last and self.keyboard else None,
|
||||
parse_mode=self.parse_mode,
|
||||
disable_notification=self.disable_notification,
|
||||
protect_content=self.protect,
|
||||
)
|
||||
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.CHOOSE_STICKER,
|
||||
)
|
||||
if self.chat_action and is_last:
|
||||
await message.bot.send_chat_action(
|
||||
chat_id=message.chat.id,
|
||||
action=ChatAction.CHOOSE_STICKER,
|
||||
)
|
||||
|
||||
# Проверка на ошибку
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user