О да фиксы
Some checks failed
CI / Lint (ruff + mypy) (push) Failing after 35s
CI / Run tests (push) Has been skipped
CI / Docker build test (push) Successful in 17s

This commit is contained in:
2026-03-31 15:31:48 +07:00
parent c10f3bf862
commit a26584c4fe
2 changed files with 126 additions and 21 deletions

View File

@@ -52,16 +52,10 @@ def help_result_keyboard(
total_pages=total_pages,
)
builder.button(text="Назад", callback_data=back_callback)
if is_admin:
if total_pages > 1:
builder.adjust(3, 1)
else:
builder.adjust(1)
if total_pages > 1:
builder.adjust(3, 1)
else:
if total_pages > 1:
builder.adjust(3, 1)
else:
builder.adjust(1)
builder.adjust(1)
return builder.as_markup()
@@ -73,9 +67,8 @@ def admin_home_keyboard() -> InlineKeyboardMarkup:
builder.button(text="Настройки бота", callback_data="admin:menu:settings")
builder.button(text="Администраторы", callback_data="admin:menu:admins")
builder.button(text="Mute rules", callback_data="admin:mute_list")
builder.button(text="Инструкция", callback_data="admin:guide")
builder.button(text="Назад", callback_data="help:open")
builder.adjust(2, 2, 2, 2)
builder.adjust(2, 2, 2, 1)
return builder.as_markup()
@@ -87,9 +80,8 @@ def admin_sync_keyboard() -> InlineKeyboardMarkup:
builder.button(text="Интервал sync", callback_data="admin:settings:sync_interval")
builder.button(text="День отчёта", callback_data="admin:settings:digest_day")
builder.button(text="Время отчёта", callback_data="admin:settings:digest_time")
builder.button(text="Часовой пояс", callback_data="admin:settings:digest_timezone")
builder.button(text="Назад", callback_data="admin:open")
builder.adjust(2, 2, 2, 1, 1)
builder.adjust(2, 2, 2, 1)
return builder.as_markup()
@@ -106,11 +98,12 @@ def admin_routing_keyboard() -> InlineKeyboardMarkup:
def admin_settings_keyboard() -> InlineKeyboardMarkup:
builder = InlineKeyboardBuilder()
builder.button(text="Часовой пояс", callback_data="admin:settings:digest_timezone")
builder.button(text="Название бота", callback_data="admin:settings:bot_title")
builder.button(text="Описание бота", callback_data="admin:settings:bot_purpose")
builder.button(text="Подсказка админу", callback_data="admin:settings:bot_admin_hint")
builder.button(text="Назад", callback_data="admin:open")
builder.adjust(2, 1, 1)
builder.adjust(2, 2, 1)
return builder.as_markup()
@@ -125,21 +118,19 @@ def admin_recipients_keyboard() -> InlineKeyboardMarkup:
def admin_recipient_group_keyboard(group_name: str) -> InlineKeyboardMarkup:
builder = InlineKeyboardBuilder()
builder.button(text="Список", callback_data=f"admin:recipients:list:{group_name}")
builder.button(text="Добавить ID", callback_data=f"admin:recipients:add:{group_name}")
builder.button(text="Удалить ID", callback_data=f"admin:recipients:del:{group_name}")
builder.button(text="Назад", callback_data="admin:menu:recipients")
builder.adjust(2, 1, 1)
builder.adjust(2, 1)
return builder.as_markup()
def admin_admins_keyboard() -> InlineKeyboardMarkup:
builder = InlineKeyboardBuilder()
builder.button(text="Список", callback_data="admin:admins")
builder.button(text="Добавить ID", callback_data="admin:admins:add")
builder.button(text="Удалить ID", callback_data="admin:admins:del")
builder.button(text="Назад", callback_data="admin:open")
builder.adjust(2, 1, 1)
builder.adjust(2, 1)
return builder.as_markup()