Untitled
4ae4d
plain_text
a month ago
36 kB
2
Indexable
diff --git a/services/bot/core/handlers/__init__.py b/services/bot/core/handlers/__init__.py
index 911426d..bcc9920 100644
--- a/services/bot/core/handlers/__init__.py
+++ b/services/bot/core/handlers/__init__.py
@@ -35,7 +35,6 @@ from .moderation import (
event_menu_edit_handler,
event_menu_enter_code_start_handler,
event_tags_toggle_handler,
- event_view_by_id_start,
events_rt,
gosb_approved,
gosb_update_selected,
@@ -102,7 +101,6 @@ __all__ = [
"event_user_enter_code_start_handler",
"event_user_sign_out_handler",
"event_user_sign_up_handler",
- "event_view_by_id_start",
"events_filters_apply_handler",
"events_filters_back_handler",
"events_filters_mode_open_handler",
diff --git a/services/bot/core/handlers/events_ui.py b/services/bot/core/handlers/events_ui.py
index f256195..5666f74 100644
--- a/services/bot/core/handlers/events_ui.py
+++ b/services/bot/core/handlers/events_ui.py
@@ -153,7 +153,13 @@ def build_back_keyboard(ctx_name: str) -> list[InteractiveMediaGroup]:
if not ui.back_value:
return []
return MediaGroupBuilder(
- [Button(media_id="leave", value=ui.back_value, label=ui.back_label)]
+ [
+ Button(
+ media_id=ui.back_value,
+ value="",
+ label=ui.back_label,
+ )
+ ]
).build()
diff --git a/services/bot/core/handlers/moderation.py b/services/bot/core/handlers/moderation.py
index b8a32e1..80fa54c 100644
--- a/services/bot/core/handlers/moderation.py
+++ b/services/bot/core/handlers/moderation.py
@@ -1001,19 +1001,6 @@ def event_create_participation_limit_step(
)
[email protected]
-def event_view_by_id_start(event: UpdateInteractiveMediaEvent, context: FSMContext): # legacy
- """старт диалога - просим у модератора UUID мероприятия"""
- delete_prev_message_by_peer(bot, event.peer)
-
- bot.messaging.send_message(
- peer=event.peer,
- text="Введи UUID мероприятия, которое хочешь посмотреть.\n\n",
- interactive_media_groups=back_to_moderation_keyboard(),
- )
- context.set_state(EventViewState.wait_event_id)
-
-
@events_rt.message(state=EventViewState.wait_event_id)
@bot.di
def event_view_by_id_step( # legacy
diff --git a/services/bot/core/handlers/report.py b/services/bot/core/handlers/report.py
index 2b35302..a9c6903 100644
--- a/services/bot/core/handlers/report.py
+++ b/services/bot/core/handlers/report.py
@@ -34,11 +34,10 @@ def _fmt_period(date_from: date | None, date_to: date | None) -> str: # legacy
return f"с {date_from.strftime('%d.%m.%Y')} по сегодня"
if date_from is None and date_to is not None:
return f"по {date_to.strftime('%d.%m.%Y')}"
- return f"с {date_from.strftime('%d.%m.%Y')} по {date_to.strftime('%d.%m.%Y')}"
+ if date_from is not None and date_to is not None:
+ return f"с {date_from.strftime('%d.%m.%Y')} по {date_to.strftime('%d.%m.%Y')}"
-
-def _get_button_id(event: UpdateInteractiveMediaEvent) -> str: # legacy
- return str(getattr(event, "id", "") or "")
+ raise Exception("Unreachable code")
@bot.di
@@ -51,9 +50,9 @@ def reports_export_handler( # legacy
delete_prev_message_by_peer(bot, peer)
uid = f"reports_export_peer_{peer.id}"
- btn_id = _get_button_id(event)
+ value = event.data.value
- if btn_id not in ("rep_day", "rep_week", "rep_month", "rep_all", "rep_from", "rep_range"):
+ if value not in ("rep_day", "rep_week", "rep_month", "rep_all", "rep_from", "rep_range"):
context.set_state(None)
bot.messaging.send_message(
peer=peer,
@@ -64,7 +63,7 @@ def reports_export_handler( # legacy
today = date.today()
- if btn_id == "rep_day":
+ if value == "rep_day":
_export_and_send(
peer=peer,
report_service=report_service,
@@ -73,7 +72,7 @@ def reports_export_handler( # legacy
uid=uid,
)
return
- if btn_id == "rep_week":
+ if value == "rep_week":
_export_and_send(
peer=peer,
report_service=report_service,
@@ -82,7 +81,7 @@ def reports_export_handler( # legacy
uid=uid,
)
return
- if btn_id == "rep_month":
+ if value == "rep_month":
_export_and_send(
peer=peer,
report_service=report_service,
@@ -91,7 +90,7 @@ def reports_export_handler( # legacy
uid=uid,
)
return
- if btn_id == "rep_all":
+ if value == "rep_all":
_export_and_send(
peer=peer,
report_service=report_service,
@@ -101,7 +100,7 @@ def reports_export_handler( # legacy
)
return
- if btn_id == "rep_from":
+ if value == "rep_from":
context.set_state(ReportExportState.wait_from)
context.update_data({"report_export_mode": "from_today"})
bot.messaging.send_message(
@@ -111,7 +110,7 @@ def reports_export_handler( # legacy
)
return
- if btn_id == "rep_range":
+ if value == "rep_range":
context.set_state(ReportExportState.wait_from)
context.update_data({"report_export_mode": "range"})
bot.messaging.send_message(
diff --git a/services/bot/core/handlers/request.py b/services/bot/core/handlers/request.py
index ea07e27..1c73397 100644
--- a/services/bot/core/handlers/request.py
+++ b/services/bot/core/handlers/request.py
@@ -131,7 +131,7 @@ def _send_requests_list_screen(
has_next=has_next,
prev_media_id=ui.prev_media_id,
next_media_id=ui.next_media_id,
- leave_value="moderation",
+ leave_media_id="moderation",
leave_label="🛡️ В меню моддерации",
)
bot.messaging.send_message(peer=peer, text=text, interactive_media_groups=im)
@@ -160,7 +160,7 @@ def _send_requests_list_screen(
has_next=has_next,
prev_media_id=ui.prev_media_id,
next_media_id=ui.next_media_id,
- leave_value="moderation",
+ leave_media_id="moderation",
leave_label="🛡️ В меню модерации",
)
diff --git a/services/bot/core/markups/event.py b/services/bot/core/markups/event.py
index cf4973d..86e2a9f 100644
--- a/services/bot/core/markups/event.py
+++ b/services/bot/core/markups/event.py
@@ -120,7 +120,7 @@ def event_actions_keyboard( # legacy
if can_view_report:
actions.append(Button(media_id="event_report_view", value=v, label="📄 Посмотреть отчёт"))
if back_value is not None:
- actions.append(Button(media_id="leave", value=back_value, label=back_label))
+ actions.append(Button(media_id=back_value, value="", label=back_label))
return MediaGroupBuilder(actions).build()
@@ -208,7 +208,7 @@ def user_events_pagination_keyboard( # legacy
has_next=has_next,
prev_media_id="user_events_prev",
next_media_id="user_events_next",
- leave_value="volunteer_home",
+ leave_media_id="volunteer_home",
leave_label="🏡 В дом волонтёра",
keep_layout=True,
add_view_by_uuid_button=True,
@@ -226,7 +226,7 @@ def part_events_pagination_keyboard( # legacy
has_next=has_next,
prev_media_id="part_events_prev",
next_media_id="part_events_next",
- leave_value="volunteer_home",
+ leave_media_id="volunteer_home",
leave_label="🏡 В дом волонтёра",
keep_layout=True,
add_view_by_uuid_button=True,
@@ -244,7 +244,7 @@ def my_events_pagination_keyboard( # legacy
has_next=has_next,
prev_media_id="my_events_prev",
next_media_id="my_events_next",
- leave_value="moderation",
+ leave_media_id="moderation",
leave_label="🛡️ В меню модерации",
keep_layout=True,
add_view_by_uuid_button=True,
@@ -289,17 +289,19 @@ def events_select_keyboard(
) -> list[InteractiveMediaGroup]:
"""
строит список кнопок по мероприятиям
- нажатие вызывает handler по _id = open_media_id, value = event.id
+ нажатие вызывает handler по _id = open_media_id, value = event.id[|ctx]
"""
groups: list[InteractiveMediaGroup] = []
row: list[Button] = []
idx = start_index
for event_card in events_cards:
- label = _event_button_label(event_card, ctx)
+ event_id = str(getattr(event_card.event, "id", ""))
row.append(
Button(
- media_id=open_media_id, value=str(getattr(event_card.event, "id", "")), label=label
+ media_id=open_media_id,
+ value=f"{event_id}|{ctx}" if ctx else event_id,
+ label=_event_button_label(event_card, ctx),
)
)
idx += 1
diff --git a/services/bot/core/markups/inline.py b/services/bot/core/markups/inline.py
index 199b3ad..c0b643a 100644
--- a/services/bot/core/markups/inline.py
+++ b/services/bot/core/markups/inline.py
@@ -8,28 +8,28 @@ def main_keyboard_admin():
group_builder_1 = MediaGroupBuilder(
[
Button(
- "1",
- "volunteer_home",
- "🏡 Дом волонтёра",
+ media_id="volunteer_home",
+ value="",
+ label="🏡 Дом волонтёра",
),
Button(
- "2",
- "ai_assistant",
- "✨ ИИ Волонтёр",
+ media_id="ai_assistant",
+ value="",
+ label="✨ ИИ Волонтёр",
),
]
)
group_builder_2 = MediaGroupBuilder(
[
Button(
- "3",
- "moderation",
- "🛡️ Модерация",
+ media_id="moderation",
+ value="",
+ label="🛡️ Модерация",
),
Button(
- "4",
- "administration",
- "⚙️ Администрирование",
+ media_id="administration",
+ value="",
+ label="⚙️ Администрирование",
),
]
)
@@ -41,18 +41,26 @@ def main_keyboard_moder(): # legacy
group_builder_1 = MediaGroupBuilder(
[
Button(
- "1",
- "volunteer_home",
- "🏡 Дом волонтёра",
+ media_id="volunteer_home",
+ value="1",
+ label="🏡 Дом волонтёра",
),
Button(
- "2",
- "ai_assistant",
- "✨ ИИ Волонтёр",
+ media_id="ai_assistant",
+ value="2",
+ label="✨ ИИ Волонтёр",
),
]
)
- group_builder_2 = MediaGroupBuilder([Button("3", "moderation", "Модерация")])
+ group_builder_2 = MediaGroupBuilder(
+ [
+ Button(
+ media_id="moderation",
+ value="3",
+ label="Модерация",
+ )
+ ]
+ )
return group_builder_1.merge([group_builder_2])
@@ -61,14 +69,14 @@ def main_keyboard_user(): # legacy
builder = MediaGroupBuilder(
[
Button(
- "1",
- "volunteer_home",
- "🏡 Дом волонтёра",
+ media_id="volunteer_home",
+ value="1",
+ label="🏡 Дом волонтёра",
),
Button(
- "2",
- "ai_assistant",
- "✨ ИИ Волонтёр",
+ media_id="ai_assistant",
+ value="2",
+ label="✨ ИИ Волонтёр",
),
]
)
@@ -76,12 +84,28 @@ def main_keyboard_user(): # legacy
def back_to_main_menu_keyboard(): # legacy
- builder = MediaGroupBuilder([Button("20", "main_menu", "⬅️ В меню")])
+ builder = MediaGroupBuilder(
+ [
+ Button(
+ media_id="main_menu",
+ value="20",
+ label="⬅️ В меню",
+ )
+ ]
+ )
return builder.build()
def back_to_admin_menu_keyboard():
- builder = MediaGroupBuilder([Button("20", "administration", "⬅️ В меню администрирования")])
+ builder = MediaGroupBuilder(
+ [
+ Button(
+ media_id="administration",
+ value="20",
+ label="⬅️ В меню администрирования",
+ )
+ ]
+ )
return builder.build()
@@ -89,19 +113,39 @@ def back_to_admin_menu_keyboard():
def volunteer_home_keyboard(): # legacy
group_builder_1 = MediaGroupBuilder(
[
- Button("1", "my_profile", "👤 Мой профиль"),
- Button("2", "events", "🌐 Мероприятия"),
+ Button(
+ media_id="my_profile",
+ value="1",
+ label="👤 Мой профиль",
+ ),
+ Button(
+ media_id="events",
+ value="2",
+ label="🌐 Мероприятия",
+ ),
]
)
group_builder_2 = MediaGroupBuilder(
[
- Button("3", "points", "🏆 Баллы"),
- Button("4", "part_events", "🎉 Мои мероприятия"),
+ Button(
+ media_id="points",
+ value="3",
+ label="🏆 Баллы",
+ ),
+ Button(
+ media_id="part_events",
+ value="4",
+ label="🎉 Мои мероприятия",
+ ),
]
)
group_builder_3 = MediaGroupBuilder(
[
- Button("5", "main_menu", "⬅️ В меню"),
+ Button(
+ media_id="main_menu",
+ value="5",
+ label="⬅️ В меню",
+ ),
]
)
@@ -112,14 +156,14 @@ def back_to_moderation_and_skip_keyboard():
builder = MediaGroupBuilder(
[
Button(
- "2",
- "project_input_dash",
- "➡️ Пропустить",
+ media_id="project_input_dash",
+ value="2",
+ label="➡️ Пропустить",
),
Button(
- "1",
- "moderation",
- "⬅️ В меню модерации",
+ media_id="moderation",
+ value="1",
+ label="⬅️ В меню модерации",
),
]
)
@@ -130,9 +174,9 @@ def back_to_moderation_keyboard(): # legacy
builder = MediaGroupBuilder(
[
Button(
- "1",
- "moderation",
- "⬅️ В меню модерации",
+ media_id="moderation",
+ value="1",
+ label="⬅️ В меню модерации",
),
]
)
@@ -143,9 +187,9 @@ def back_to_volunteer_home_keyboard(): # legacy
builder = MediaGroupBuilder(
[
Button(
- "1",
- "volunteer_home",
- "⬅️ В дом волонтёра",
+ media_id="volunteer_home",
+ value="1",
+ label="⬅️ В дом волонтёра",
)
]
)
@@ -156,32 +200,56 @@ def back_to_volunteer_home_keyboard(): # legacy
def moderation_menu_keyboard(): # legacy
group_builder_1 = MediaGroupBuilder(
[
- Button("1", "create_event", "🗓️ Создать мероприятие"),
- Button("4", "my_events", "📋 Мои мероприятия"),
+ Button(
+ media_id="create_event",
+ value="1",
+ label="🗓️ Создать мероприятие",
+ ),
+ Button(
+ media_id="my_events",
+ value="4",
+ label="📋 Мои мероприятия",
+ ),
]
)
group_builder_2 = MediaGroupBuilder(
[
Button(
- "5",
- "all_events",
- "🌐 Все мероприятия",
+ media_id="all_events",
+ value="5",
+ label="🌐 Все мероприятия",
+ ),
+ Button(
+ media_id="download_reports_list",
+ value="7",
+ label="📥 Выгрузить отчёты",
),
- Button("7", "download_reports_list", "📥 Выгрузить отчёты"),
]
)
group_builder_3 = MediaGroupBuilder(
[
- Button("2", "requests", "📩 Заявки"),
- Button("3", "my_requests", "✉️ Мои заявки"),
+ Button(
+ media_id="requests",
+ value="2",
+ label="📩 Заявки",
+ ),
+ Button(
+ media_id="my_requests",
+ value="3",
+ label="✉️ Мои заявки",
+ ),
]
)
group_builder_4 = MediaGroupBuilder(
[
- Button("10", "main_menu", "⬅️ В меню"),
+ Button(
+ media_id="main_menu",
+ value="10",
+ label="⬅️ В меню",
+ ),
]
)
@@ -220,7 +288,15 @@ def admin_menu_keyboard():
]
)
- group_builder_3 = MediaGroupBuilder([Button("5", "main_menu", "⬅️ В меню")])
+ group_builder_3 = MediaGroupBuilder(
+ [
+ Button(
+ media_id="main_menu",
+ value="5",
+ label="⬅️ В меню",
+ )
+ ]
+ )
return group_builder_1.merge([group_builder_2, group_builder_3])
@@ -233,25 +309,53 @@ def reports_export_keyboard(): # legacy
group_1 = MediaGroupBuilder(
[
- Button("rep_day", "download_reports_list", "📅 Последний день"),
- Button("rep_week", "download_reports_list", "📆 Неделя"),
+ Button(
+ media_id="download_reports_list",
+ value="rep_day",
+ label="📅 Последний день",
+ ),
+ Button(
+ media_id="download_reports_list",
+ value="rep_week",
+ label="📆 Неделя",
+ ),
]
)
group_2 = MediaGroupBuilder(
[
- Button("rep_month", "download_reports_list", "🗓️ Месяц"),
- Button("rep_all", "download_reports_list", "🌐 Всё время"),
+ Button(
+ media_id="download_reports_list",
+ value="rep_month",
+ label="🗓️ Месяц",
+ ),
+ Button(
+ media_id="download_reports_list",
+ value="rep_all",
+ label="🌐 Всё время",
+ ),
]
)
group_3 = MediaGroupBuilder(
[
- Button("rep_from", "download_reports_list", "📌 От даты до сегодня"),
- Button("rep_range", "download_reports_list", "🗓️ От даты до даты"),
+ Button(
+ media_id="download_reports_list",
+ value="rep_from",
+ label="📌 От даты до сегодня",
+ ),
+ Button(
+ media_id="download_reports_list",
+ value="rep_range",
+ label="🗓️ От даты до даты",
+ ),
]
)
group_4 = MediaGroupBuilder(
[
- Button("rep_back", "moderation", "⬅️ В меню модерации"),
+ Button(
+ media_id="moderation",
+ value="rep_back",
+ label="⬅️ В меню модерации",
+ ),
]
)
return group_1.merge([group_2, group_3, group_4])
@@ -261,9 +365,9 @@ def back_to_reports_export_keyboard(): # legacy
return MediaGroupBuilder(
[
Button(
- "9",
- "download_reports_list",
- "⬅️ В меню выгрузки отчётов",
+ media_id="download_reports_list",
+ value="9",
+ label="⬅️ В меню выгрузки отчётов",
),
]
).build()
@@ -279,7 +383,7 @@ def all_events_pagination_keyboard(
has_next=has_next,
prev_media_id="all_events_prev",
next_media_id="all_events_next",
- leave_value="moderation",
+ leave_media_id="moderation",
leave_label="🛡️ В меню модерации",
keep_layout=True,
add_view_by_uuid_button=True,
@@ -297,7 +401,7 @@ def all_requests_pagination_keyboard(
has_next=has_next,
prev_media_id="all_requests_prev",
next_media_id="all_requests_next",
- leave_value="moderation",
+ leave_media_id="moderation",
leave_label="🛡️ В меню модерации",
keep_layout=True,
add_view_by_uuid_button=True,
diff --git a/services/bot/core/markups/pagination.py b/services/bot/core/markups/pagination.py
index c8162d6..dbc6bba 100644
--- a/services/bot/core/markups/pagination.py
+++ b/services/bot/core/markups/pagination.py
@@ -16,9 +16,9 @@ def pagination_keyboard( # legacy
prev_label: str = "⬅️ Назад",
next_label: str = "➡️ Вперёд",
include_leave: bool = True,
- leave_media_id: str = "leave",
- leave_value: str | None = None,
- leave_label: str | None = None,
+ leave_media_id: str | None = None,
+ leave_value: str | None = "",
+ leave_label: str | None = "⬅️ Назад",
keep_layout: bool = False,
placeholder_media_id: str = "noop",
placeholder_value: str = "noop",
@@ -43,6 +43,11 @@ def pagination_keyboard( # legacy
hide_when_all_placeholders=True: если из кнопок только ph - то возвращаем пустой лист.
"""
+ if leave_value is None:
+ leave_value = ""
+ if leave_label is None:
+ leave_label = "⬅️ Назад"
+
def _btn(media_id: str, value: str, label: str) -> Button: # legacy
return Button(media_id=media_id, value=value, label=label)
@@ -67,9 +72,9 @@ def pagination_keyboard( # legacy
)
def _leave() -> Button | None: # legacy
- if not (include_leave and leave_value and leave_label):
+ if not include_leave or leave_media_id is None:
return None
- return _btn(leave_media_id, str(leave_value), str(leave_label))
+ return _btn(leave_media_id, leave_value, leave_label)
# --- 3-slot layout for include_leave
if include_leave and keep_layout:
diff --git a/services/bot/core/markups/points.py b/services/bot/core/markups/points.py
index 4f4620f..a0619ff 100644
--- a/services/bot/core/markups/points.py
+++ b/services/bot/core/markups/points.py
@@ -6,19 +6,46 @@ from core.markups.pagination import pagination_keyboard
def points_menu_keyboard(): # legacy
return MediaGroupBuilder(
[
- Button("1", "points_leaderboard", "🏆 Лидерборд"),
- Button("2", "volunteer_home", "⬅️ В дом волонтёра"),
+ Button(
+ media_id="points_leaderboard",
+ value="1",
+ label="🏆 Лидерборд",
+ ),
+ Button(
+ media_id="volunteer_home",
+ value="2",
+ label="⬅️ В дом волонтёра",
+ ),
]
).build()
def back_to_points_menu(): # legacy
- return MediaGroupBuilder([Button("1", "points", "⬅️ К баллам")]).build()
+ return MediaGroupBuilder(
+ [
+ Button(
+ media_id="points",
+ value="1",
+ label="⬅️ К баллам",
+ )
+ ]
+ ).build()
def leaderboard_keyboard(): # legacy
return MediaGroupBuilder(
- [Button("1", "points_leaderboard", "🔂 Обновить"), Button("2", "points", "⬅️ К баллам")]
+ [
+ Button(
+ media_id="points_leaderboard",
+ value="1",
+ label="🔂 Обновить",
+ ),
+ Button(
+ media_id="points",
+ value="2",
+ label="⬅️ К баллам",
+ ),
+ ]
).build()
diff --git a/services/bot/core/markups/profile.py b/services/bot/core/markups/profile.py
index e0a9914..e7cdb30 100644
--- a/services/bot/core/markups/profile.py
+++ b/services/bot/core/markups/profile.py
@@ -2,14 +2,36 @@ from dialog_bot_sdk.interactive_media import Button, MediaGroupBuilder
def profile_keyboard(): # legacy
- group_builder_1 = MediaGroupBuilder([Button("1", "update_profile_menu", "⚙️ Изменить профиль")])
- group_builder_2 = MediaGroupBuilder([Button("2", "volunteer_home", "⬅️ В дом волонтёра")])
+ group_builder_1 = MediaGroupBuilder(
+ [
+ Button(
+ media_id="update_profile_menu",
+ value="1",
+ label="⚙️ Изменить профиль",
+ )
+ ]
+ )
+ group_builder_2 = MediaGroupBuilder(
+ [
+ Button(
+ media_id="volunteer_home",
+ value="2",
+ label="⬅️ В дом волонтёра",
+ )
+ ]
+ )
return group_builder_1.merge([group_builder_2])
def back_to_update_profile_keyboard(): # legacy
group_builder_1 = MediaGroupBuilder(
- [Button("1", "update_profile_menu", "⬅️ К редактированию профиля")]
+ [
+ Button(
+ media_id="update_profile_menu",
+ value="1",
+ label="⬅️ К редактированию профиля",
+ )
+ ]
)
return group_builder_1.build()
@@ -17,25 +39,56 @@ def back_to_update_profile_keyboard(): # legacy
def update_profile_keyboard(): # legacy
group_builder_1 = MediaGroupBuilder(
[
- # Button("update_user_name", "name", "👤 Изменить имя"),
- Button("update_user_interests", "interests", "🎯 Изменить интересы"),
- Button("update_user_region", "region", "📍 Изменить регион"),
+ Button(
+ media_id="update_user_interests",
+ value="interests",
+ label="🎯 Изменить интересы",
+ ),
+ Button(
+ media_id="update_user_region",
+ value="region",
+ label="📍 Изменить регион",
+ ),
+ ]
+ )
+ group_builder_2 = MediaGroupBuilder(
+ [
+ Button(
+ media_id="volunteer_home",
+ value="4",
+ label="⬅️ В дом волонтёра",
+ )
]
)
- group_builder_2 = MediaGroupBuilder([Button("4", "volunteer_home", "⬅️ В дом волонтёра")])
return group_builder_1.merge([group_builder_2])
def update_interests_keyboard(): # legacy
- back = MediaGroupBuilder([Button("1", "update_profile_menu", "⬅️ К редактированию профиля")])
+ back = MediaGroupBuilder(
+ [
+ Button(
+ media_id="update_profile_menu",
+ value="1",
+ label="⬅️ К редактированию профиля",
+ )
+ ]
+ )
return back.build()
def ask_region_keyboard(): # legacy
group = MediaGroupBuilder(
[
- Button("1", "update_profile_menu", "Изменить профиль"),
- Button("2", "volunteer_home", "В дом волонтёра"),
+ Button(
+ media_id="update_profile_menu",
+ value="1",
+ label="Изменить профиль",
+ ),
+ Button(
+ media_id="volunteer_home",
+ value="2",
+ label="В дом волонтёра",
+ ),
]
)
return group.build()
diff --git a/services/bot/core/markups/request.py b/services/bot/core/markups/request.py
index 0d005fc..c788365 100644
--- a/services/bot/core/markups/request.py
+++ b/services/bot/core/markups/request.py
@@ -90,7 +90,7 @@ def requests_pagination_keyboard(
has_next: bool,
prev_media_id: str = "requests_prev",
next_media_id: str = "requests_next",
- leave_value: str = "moderation",
+ leave_media_id: str = "moderation",
leave_label: str = "🛡️ В меню модерации",
keep_layout: bool = True,
) -> list[InteractiveMediaGroup]:
@@ -104,7 +104,7 @@ def requests_pagination_keyboard(
has_next=has_next,
prev_media_id=prev_media_id,
next_media_id=next_media_id,
- leave_value=leave_value,
+ leave_media_id=leave_media_id,
leave_label=leave_label,
keep_layout=keep_layout,
)
diff --git a/services/bot/main.py b/services/bot/main.py
index a969349..6d7f0ca 100644
--- a/services/bot/main.py
+++ b/services/bot/main.py
@@ -22,7 +22,6 @@ from core.handlers import (
event_user_enter_code_start_handler,
event_user_sign_out_handler,
event_user_sign_up_handler,
- event_view_by_id_start,
events_filters_apply_handler,
events_filters_back_handler,
events_filters_mode_open_handler,
@@ -124,23 +123,21 @@ def handlers_setting() -> None: # legacy
bot.messaging.event_handler(
[
- EventHandler(function=volunteer_home_handler, value="volunteer_home"),
- EventHandler(function=main_menu_handler, value="main_menu"),
- EventHandler(function=ai_assistant_handler, value="ai_assistant"),
- EventHandler(function=my_profile_handler, value="my_profile"),
- EventHandler(function=update_user_menu_handler, value="update_profile_menu"),
+ EventHandler(function=volunteer_home_handler, _id="volunteer_home"),
+ EventHandler(function=main_menu_handler, _id="main_menu"),
+ EventHandler(function=ai_assistant_handler, _id="ai_assistant"),
+ EventHandler(function=my_profile_handler, _id="my_profile"),
+ EventHandler(function=update_user_menu_handler, _id="update_profile_menu"),
EventHandler(function=update_user_name_start, _id="update_user_name"),
EventHandler(function=update_user_interests_start, _id="update_user_interests"),
EventHandler(function=profile_tags_toggle_handler, _id="profile_tags_toggle"),
- EventHandler(function=points_menu_handler, value="points"),
- EventHandler(function=points_leaderboard_handler, value="points_leaderboard"),
- EventHandler(function=moderation_menu_handler, value="moderation"),
- EventHandler(function=reports_export_handler, value="download_reports_list"),
- EventHandler(function=all_events_handler, value="all_events"),
- EventHandler(function=events_menu_handler, value="events"),
- EventHandler(function=part_events_menu_handler, value="part_events"),
- # TODO почистить
- EventHandler(function=project_input_dash_handler, value="project_input_dash"),
+ EventHandler(function=points_menu_handler, _id="points"),
+ EventHandler(function=points_leaderboard_handler, _id="points_leaderboard"),
+ EventHandler(function=moderation_menu_handler, _id="moderation"),
+ EventHandler(function=reports_export_handler, _id="download_reports_list"),
+ EventHandler(function=all_events_handler, _id="all_events"),
+ EventHandler(function=events_menu_handler, _id="events"),
+ EventHandler(function=part_events_menu_handler, _id="part_events"),
EventHandler(function=user_events_page_handler, _id="user_events_prev"),
EventHandler(function=user_events_page_handler, _id="user_events_next"),
EventHandler(function=part_events_page_handler, _id="part_events_prev"),
@@ -154,13 +151,12 @@ def handlers_setting() -> None: # legacy
EventHandler(function=report_view_handler, _id="event_report_view"),
EventHandler(function=all_events_page_handler, _id="all_events_prev"),
EventHandler(function=all_events_page_handler, _id="all_events_next"),
- EventHandler(function=my_events_handler, value="my_events"),
+ EventHandler(function=my_events_handler, _id="my_events"),
EventHandler(function=my_events_page_handler, _id="my_events_prev"),
EventHandler(function=my_events_page_handler, _id="my_events_next"),
EventHandler(function=my_events_open_handler, _id="my_events_open"),
- EventHandler(function=create_event_start_handler, value="create_event"),
- EventHandler(function=event_view_by_id_start, value="update_event"),
- EventHandler(function=admin_menu_handler, value="administration"),
+ EventHandler(function=create_event_start_handler, _id="create_event"),
+ EventHandler(function=admin_menu_handler, _id="administration"),
EventHandler(function=event_menu_enter_code_start_handler, _id="event_menu_enter_code"),
EventHandler(function=event_menu_delete_handler, _id="event_menu_delete"),
EventHandler(function=event_menu_edit_handler, _id="event_menu_edit"),
@@ -198,8 +194,8 @@ def handlers_setting() -> None: # legacy
EventHandler(
function=events_filters_mode_select_handler, _id="events_filters_mode_select"
),
- EventHandler(function=all_requests_handler, value="requests"),
- EventHandler(function=my_requests_handler, value="my_requests"),
+ EventHandler(function=all_requests_handler, _id="requests"),
+ EventHandler(function=my_requests_handler, _id="my_requests"),
EventHandler(function=requests_page_handler, _id="requests_prev"),
EventHandler(function=my_requests_page_handler, _id="my_requests_prev"),
EventHandler(function=requests_page_handler, _id="requests_next"),
@@ -211,7 +207,7 @@ def handlers_setting() -> None: # legacy
EventHandler(function=request_repeat_handler, _id="request_repeat"),
EventHandler(function=request_cancel_handler, _id="request_cancel"),
# TODO почистить
- EventHandler(function=project_input_dash_handler, value="project_input_dash"),
+ EventHandler(function=project_input_dash_handler, _id="project_input_dash"),
EventHandler(function=noop_handler, _id="noop_prev"),
EventHandler(function=noop_handler, _id="noop_mid"),
EventHandler(function=noop_handler, _id="noop_next"),
Editor is loading...
Leave a Comment