[ZILANT] коррекция логики проверки добавленных ссылок
This commit is contained in:
+4
-9
@@ -156,7 +156,7 @@ async def download_image(image_url, httpx_client):
|
||||
|
||||
|
||||
async def _edit_post_add_links(
|
||||
bot, message_id, message_has_image, final_text, vk_post_id, expected_urls, min_length
|
||||
bot, message_id, message_has_image, final_text, vk_post_id, expected_urls
|
||||
):
|
||||
"""
|
||||
Второй шаг публикации: editMessageCaption/Text со ссылками.
|
||||
@@ -186,9 +186,7 @@ async def _edit_post_add_links(
|
||||
published_text = edited.text or ""
|
||||
entities = edited.entities or []
|
||||
|
||||
if published_message_has_expected_links(
|
||||
entities, expected_urls, result_text=published_text, min_length=min_length
|
||||
):
|
||||
if published_message_has_expected_links(entities, expected_urls):
|
||||
logger.info(
|
||||
f"Ссылки добавлены для записи VK ID {vk_post_id} "
|
||||
f"(попытка {attempt}/{EDIT_LINKS_MAX_ATTEMPTS})"
|
||||
@@ -199,8 +197,7 @@ async def _edit_post_add_links(
|
||||
logger.warning(
|
||||
f"editMessage* ok, но footer-ссылки не подтверждены "
|
||||
f"(попытка {attempt}/{EDIT_LINKS_MAX_ATTEMPTS}) для VK ID {vk_post_id}; "
|
||||
f"ожидались {expected_urls}, найдены text_link: {found}, "
|
||||
f"len(text)={len(published_text)}, min_len={min_length}"
|
||||
f"ожидались {expected_urls}, найдены text_link: {found}"
|
||||
)
|
||||
except TimedOut as e:
|
||||
if attempt >= EDIT_LINKS_MAX_ATTEMPTS:
|
||||
@@ -534,11 +531,9 @@ async def publish_to_tg(vk_post_id):
|
||||
expected_urls.append(
|
||||
subscription_start_link(RESPONDER_BOT_NAME, "post", message_id)
|
||||
)
|
||||
min_length = len(final_text) - 15
|
||||
|
||||
if not await _edit_post_add_links(
|
||||
bot, message_id, message_has_image, final_text, vk_post_id,
|
||||
expected_urls, min_length,
|
||||
expected_urls,
|
||||
):
|
||||
logger.error(
|
||||
f"Запись VK ID {vk_post_id}: сообщение отправлено (id={message_id}), "
|
||||
|
||||
Reference in New Issue
Block a user