[ZILANT] коррекция логики проверки добавленных ссылок
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/manual/woodpecker Pipeline was successful

This commit is contained in:
2026-09-02 22:49:03 +03:00
parent f74953e082
commit 87ccd23e96
7 changed files with 25 additions and 40 deletions
+5 -9
View File
@@ -134,7 +134,7 @@ async def download_image(image_url, httpx_client):
async def _edit_event_add_links(
httpx_client, has_image, message_id, final_text, entity_label, expected_urls, min_length
httpx_client, has_image, message_id, final_text, entity_label, expected_urls
):
"""Edit caption/text со ссылками; повтор до подтверждения всех expected_urls в text_link."""
await asyncio.sleep(EDIT_LINKS_INITIAL_DELAY_SEC)
@@ -179,9 +179,7 @@ async def _edit_event_add_links(
result = data.get('result') or {}
result_text = result.get(field) or ""
entities = result.get(entities_field) or []
if published_message_has_expected_links(
entities, expected_urls, result_text=result_text, min_length=min_length
):
if published_message_has_expected_links(entities, expected_urls):
logger.info(
f"Ссылки добавлены для {entity_label} "
f"(попытка {attempt}/{EDIT_LINKS_MAX_ATTEMPTS})"
@@ -191,8 +189,7 @@ async def _edit_event_add_links(
logger.warning(
f"edit ok, но footer-ссылки не подтверждены "
f"(попытка {attempt}/{EDIT_LINKS_MAX_ATTEMPTS}) для {entity_label}; "
f"ожидались {expected_urls}, найдены text_link: {found}, "
f"len(text)={len(result_text)}, min_len={min_length}"
f"ожидались {expected_urls}, найдены text_link: {found}"
)
else:
error_code = data.get('error_code')
@@ -548,7 +545,6 @@ async def tg_post_event(httpx_client, event_data):
expected_urls.append(
subscription_start_link(RESPONDER_BOT_NAME, "event", message_id)
)
min_length = len(final_text) - 15
# Проверяем, изменился ли текст. Если нет - не редактируем сообщение
if final_text == initial_text:
@@ -558,12 +554,12 @@ async def tg_post_event(httpx_client, event_data):
entity_label = f"события {event_data['number']}"
links_ok = await _edit_event_add_links(
httpx_client, message_is_photo, message_id, final_text, entity_label,
expected_urls, min_length,
expected_urls,
)
if not links_ok and message_is_photo:
links_ok = await _edit_event_add_links(
httpx_client, False, message_id, final_text, entity_label,
expected_urls, min_length,
expected_urls,
)
if not links_ok:
logger.error(