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

Compare commits

base: other:120fdef189b7f3d0100819ea221bd135fc603dd2
Branches Tags
other:main
other:stable
other:mailing
other:v0.1.1
other:v0.0.3
...
compare: other:c027ec656b65fcf3baa51c0dd885ce968a9e5ce8
Branches Tags
other:stable
other:main
other:mailing
other:v0.1.1
other:v0.0.3

10 Commits
120fdef189 ... c027ec656b

Author SHA1 Message Date
er8dd
c027ec656b minor fixes 2024-03-03 00:30:23 +04:00
er8dd
f79a9f317d Merge branch 'main' into stable 2024-03-03 00:10:32 +04:00
er8dd
eeb6c65f36 minor fixes 2024-03-03 00:07:45 +04:00
er8dd
7a0ce10c56 mailing size limit 2024-03-02 20:50:40 +04:00
er8dd
44f39e4de0 Merge branch 'main' into stable 2024-03-02 20:05:23 +04:00
jjki3d
7aacb2e38f Merge branch 'main' into stable 2024-02-17 03:56:11 +04:00
jjki3d
1dd4d4d7fd Merge branch 'main' into stable 2024-01-13 02:29:57 +04:00
jjki3d
02e91a596c Merge branch 'main' into stable 2024-01-13 02:20:53 +04:00
walker
a262d4e488 Merge branch 'main' into stable 2022-11-05 06:11:27 +04:00
mihalin
3e1f89034a fix translations 2022-09-16 21:30:38 +04:00
3 changed files with 9 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
docs/source/additional.rst
View File

@ -10,7 +10,7 @@ Bitcoin:
``bc1qlq7cm5chc8flr3fy8ewk967aknq3dwmxtwn9hl`` ``bc1qlq7cm5chc8flr3fy8ewk967aknq3dwmxtwn9hl``
Litecoin: Litecoin:
``LTC1QXAJSVZ0LW44AA5NYTUCH8CP2G8X7A4CDASE4Y7`` ``ltc1qxajsvz0lw44aa5nytuch8cp2g8x7a4cdase4y7``
Как убрать "Этот бот создан с помощью ..." Как убрать "Этот бот создан с помощью ..."
---------------- ----------------

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",