From 721f224c8e4dc6117ed978c24dbb6a572ed4e524 Mon Sep 17 00:00:00 2001 From: Macbook Date: Sat, 20 Dec 2025 15:02:18 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D1=83=D0=B4?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=20=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D0=B8=D1=87=D0=BD=D0=BE=D0=B5=20=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.db | Bin 36864 -> 36864 bytes medods_handler.py | 1 - scheduler.py | 9 +++++++-- vk_handler.py | 17 +++++++++-------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app.db b/app.db index 4f2f238ccf6703a5bb103eaa243c0f72c2f64423..f30c3728af600de8fbbe2b8ebe30aedb4086351c 100644 GIT binary patch delta 730 zcma)3O-~b16rJKmo1!ssVSbyWtaEznj5T4+*B#i5_HwO`n7+Okj- z1hgg^qXBj2suYR^O5LzAVe#Hy;19?@(AyGS`!@HUckeyt-1o}cJ>~75%|4y?^({r` z-I-f)mUQ37UgTpO6J#b`l1QtIN^vn35Iwo1D;F)=>EUo87a4WP6Ju)L8j3o`ZEl~{ z%_h7V(KG9fan9IN&B1ZP=%}hpa`sThSm3AZ(|oFE9?uWSi7YqGg#tc4E{B4du$*1G zZ?Xx>6hCd{=_QTRg0yO!7wr@LkeZHUXMFB_N?n)<_yn62bvsp`c_!h}jNwO$Nt%ty zMUOlmSLB7s#1l5T=n4h$tkX0u`bNyTsdUj*h^Cd1`66u#4yA`}PGd@t9`spzE7en1 z|4p-nmn^)A;YA}WioFy?=?o{7;biwZIy4MElXV7)dg-s+y+Tn|D}IM-_y=y13R%T< z$PdUeZU9=Vs($*iMSu2w{a16N`q_V@G=S@fl%Zz_x5;zdzzu}!aM8dmvN5PX-&)&5 z87-F9vW3UVcqkdyvXMfNN$1c2ZsTKo)S<`6H2(fib8S!`_`jn+um1MmF5!=46-O|NK!RvrfSENQJ*2(f;os0G^Z>Mbs_G<#;VP_tlmER%(fvsa80qQ#HW_y5+ z$T~XTdh7 zJQQQ&D3{aawh#nivQUJD>fZrY%l!kvG))lirdm&L5`@_ZshZa_HnnE%oUG1t`l}E20X)V|sQGWn0K1%_16}Z0sced*MkBvt9Jo5cRO_0QNE41*nOR@BveEW*qSxvjcd6H3mAs zJ$@GYFgIy7gZ}4NVN>Vl+Vlj=^wxjep1d(*?p&3vw;cFGJ+#AScR3h4`>6u{0O=YF A=Kufz diff --git a/medods_handler.py b/medods_handler.py index 6fa9295..4c0c07d 100644 --- a/medods_handler.py +++ b/medods_handler.py @@ -121,7 +121,6 @@ def getFreeSlots(vkPost) -> dict: logger.error("Ответ не получен") return {} slotsDataFull = response.json() - logger.info(slotsDataFull) if len(slotsDataFull.keys()) == 0: logger.error("Нет свободных приемов") return {} diff --git a/scheduler.py b/scheduler.py index 63e8d2e..e358a48 100644 --- a/scheduler.py +++ b/scheduler.py @@ -65,9 +65,14 @@ def enable_publish_job(): interval_minutes = scheduleData.interval_minutes trigger = CronTrigger( - hour=f"{start_hour}-{end_hour - 1}", - minute=f"*/{interval_minutes}", + hour="12", + minute="0", + day="*", ) + # trigger = CronTrigger( + # hour=f"{start_hour}-{end_hour - 1}", + # minute=f"*/{interval_minutes}", + # ) scheduler.add_job( vk_publish_job, diff --git a/vk_handler.py b/vk_handler.py index 41e0828..35fb455 100644 --- a/vk_handler.py +++ b/vk_handler.py @@ -19,8 +19,9 @@ def handle_vk_post(): logger.error("Информация для размещения поста не найдена") return - if not vkPost.dynamic_text and not vkPost.post_id: - logger.info("Не требуется публикация или удаление поста") + if not vkPost.dynamic_text: + # if not vkPost.dynamic_text and not vkPost.post_id: + logger.info("Не требуется публикация поста") return vk_session = vk_api.VkApi(token=vkApi.access_token) @@ -32,16 +33,16 @@ def handle_vk_post(): new_post = vk.wall.post( owner_id=-vkApi.group_id, from_group=1, - message=f"{vkPost.dynamic_text}\n{vkPost.static_text}".strip(), + message=f"{vkPost.dynamic_text}{vkPost.static_text}".strip(), attachments=f"photo-{vkApi.group_id}_{vkApi.base_photo_url}", ) logger.info(f"Пост #{new_post.get('post_id')} создан") - if vkPost.post_id: - logger.info(f"Удаление поста #{vkPost.post_id}") - vk.wall.delete(owner_id=-vkApi.group_id, post_id=vkPost.post_id) - vkPost.post_id = None - vkPost.publish_at = None + # if vkPost.post_id: + # logger.info(f"Удаление поста #{vkPost.post_id}") + # vk.wall.delete(owner_id=-vkApi.group_id, post_id=vkPost.post_id) + # vkPost.post_id = None + # vkPost.publish_at = None if vkPost.dynamic_text: vkPost.dynamic_text = None