fix: send email text then attach docs separately without captions
This commit is contained in:
@@ -447,8 +447,9 @@ async def instruct_router_handler(msg: Message):
|
|||||||
raw_mail = ad_info.get("raw_mail") if ad_info else None
|
raw_mail = ad_info.get("raw_mail") if ad_info else None
|
||||||
if raw_mail:
|
if raw_mail:
|
||||||
text = INSTRUCT_EMAIL_AVAILABLE(EMOJI_DIGITS, cn, raw_mail)
|
text = INSTRUCT_EMAIL_AVAILABLE(EMOJI_DIGITS, cn, raw_mail)
|
||||||
# Отправляем первую инструкцию с текстом-подписью
|
# Отправляем текст сообщения
|
||||||
first = True
|
await msg.answer(text, parse_mode="html")
|
||||||
|
# Затем отправляем оба документа отдельно
|
||||||
for instruct_path, file_name in [
|
for instruct_path, file_name in [
|
||||||
(GMAIL_ANDROID_INSTRUCT_PATH, "Инструкция Android"),
|
(GMAIL_ANDROID_INSTRUCT_PATH, "Инструкция Android"),
|
||||||
(APPLE_INSTRUCT_PATH, "Инструкция Apple"),
|
(APPLE_INSTRUCT_PATH, "Инструкция Apple"),
|
||||||
@@ -457,10 +458,7 @@ async def instruct_router_handler(msg: Message):
|
|||||||
await msg.bot.send_document(
|
await msg.bot.send_document(
|
||||||
chat_id=msg.chat_id,
|
chat_id=msg.chat_id,
|
||||||
file=FSInputFile(instruct_path, file_name=file_name),
|
file=FSInputFile(instruct_path, file_name=file_name),
|
||||||
caption=text if first else None,
|
|
||||||
parse_mode="html" if first else None,
|
|
||||||
)
|
)
|
||||||
first = False
|
|
||||||
else:
|
else:
|
||||||
text = INSTRUCT_EMAIL_UNAVAILABLE(EMOJI_DIGITS, cn)
|
text = INSTRUCT_EMAIL_UNAVAILABLE(EMOJI_DIGITS, cn)
|
||||||
await msg.answer(text, parse_mode="html")
|
await msg.answer(text, parse_mode="html")
|
||||||
|
|||||||
Reference in New Issue
Block a user