diff --git a/main.py b/main.py index 2c43145..2a1bb87 100644 --- a/main.py +++ b/main.py @@ -7,9 +7,9 @@ from olgram.settings import TORTOISE_ORM, OlgramSettings from olgram.utils.permissions import AccessMiddleware from server.custom import init_redis +import olgram.commands.menu # noqa: F401 import olgram.commands.bots # noqa: F401 import olgram.commands.start # noqa: F401 -import olgram.commands.menu # noqa: F401 import olgram.commands.bot_actions # noqa: F401 import olgram.commands.info # noqa: F401 import olgram.commands.promo # noqa: F401 diff --git a/olgram/commands/menu.py b/olgram/commands/menu.py index fcd75df..fc907e7 100644 --- a/olgram/commands/menu.py +++ b/olgram/commands/menu.py @@ -358,6 +358,8 @@ async def mailing_text_received(message: types.Message, state: FSMContext): obj = message.audio elif message.content_type == types.ContentType.VIDEO: obj = message.video + if obj.file_size and obj.file_size > 4194304: + return await message.answer(_("Слишком большой файл (4 Мб максимум)")) try: await obj.download(buffer, timeout=5) @@ -366,10 +368,14 @@ async def mailing_text_received(message: types.Message, state: FSMContext): logging.error(err, exc_info=True) return await message.answer(_("Не удалось загрузить файл (слишком большой размер?)")) proxy["mailing_data"] = buffer.getvalue() - proxy["mailing_file_name"] = getattr(obj, "file_name") + proxy["mailing_file_name"] = getattr(obj, "file_name", None) _message_id = await send_stored_message(proxy, AioBot.get_current(), message.chat.id) keyboard = types.InlineKeyboardMarkup(row_width=1) + keyboard.insert( + types.InlineKeyboardButton(text=_("<< Отменить рассылку"), + callback_data=menu_callback.new(level=1, bot_id=bot_id, operation=empty, chat=empty)) + ) keyboard.insert( types.InlineKeyboardButton(text=_("Да, начать рассылку"), callback_data=menu_callback.new(level=3, bot_id=bot_id, operation="go_go_mailing",