other/olgram
1
0
Fork 0
mirror of https://github.com/civsocit/olgram.git synced 2025-05-24 11:03:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into stable

Browse Source
This commit is contained in:
er8dd 2024-03-03 00:10:32 +04:00
commit f79a9f317d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.py
View File

@ -7,9 +7,9 @@ from olgram.settings import TORTOISE_ORM, OlgramSettings
from olgram.utils.permissions import AccessMiddleware from olgram.utils.permissions import AccessMiddleware
from server.custom import init_redis from server.custom import init_redis
import olgram.commands.menu # noqa: F401
import olgram.commands.bots # noqa: F401 import olgram.commands.bots # noqa: F401
import olgram.commands.start # noqa: F401 import olgram.commands.start # noqa: F401
import olgram.commands.menu # noqa: F401
import olgram.commands.bot_actions # noqa: F401 import olgram.commands.bot_actions # noqa: F401
import olgram.commands.info # noqa: F401 import olgram.commands.info # noqa: F401
import olgram.commands.promo # noqa: F401 import olgram.commands.promo # noqa: F401

8
olgram/commands/menu.py
View File

@ -358,6 +358,8 @@ async def mailing_text_received(message: types.Message, state: FSMContext):
obj = message.audio obj = message.audio
elif message.content_type == types.ContentType.VIDEO: elif message.content_type == types.ContentType.VIDEO:
obj = message.video obj = message.video
if obj.file_size and obj.file_size > 4194304:
return await message.answer(_("Слишком большой файл (4 Мб максимум)"))
try: try:
await obj.download(buffer, timeout=5) 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) logging.error(err, exc_info=True)
return await message.answer(_("Не удалось загрузить файл (слишком большой размер?)")) return await message.answer(_("Не удалось загрузить файл (слишком большой размер?)"))
proxy["mailing_data"] = buffer.getvalue() 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) _message_id = await send_stored_message(proxy, AioBot.get_current(), message.chat.id)
keyboard = types.InlineKeyboardMarkup(row_width=1) 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( keyboard.insert(
types.InlineKeyboardButton(text=_("Да, начать рассылку"), types.InlineKeyboardButton(text=_("Да, начать рассылку"),
callback_data=menu_callback.new(level=3, bot_id=bot_id, operation="go_go_mailing", callback_data=menu_callback.new(level=3, bot_id=bot_id, operation="go_go_mailing",