add command params
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
from babel.support import LazyProxy
|
||||
from inspect import signature
|
||||
from aiogram.types import Message, CallbackQuery
|
||||
from aiogram.utils.i18n import I18n
|
||||
from typing import Any, TYPE_CHECKING
|
||||
import ujson as json
|
||||
|
||||
@@ -9,7 +10,7 @@ from ..model.bot_enum import BotEnum
|
||||
from ..model.settings import Settings
|
||||
|
||||
from ..model.descriptors import (
|
||||
EntityFieldDescriptor,
|
||||
FieldDescriptor,
|
||||
EntityDescriptor,
|
||||
EntityItemCaptionCallable,
|
||||
EntityFieldCaptionCallable,
|
||||
@@ -36,7 +37,13 @@ def get_user_permissions(
|
||||
return permissions
|
||||
|
||||
|
||||
def get_local_text(text: str, locale: str) -> str:
|
||||
def get_local_text(text: str, locale: str = None) -> str:
|
||||
if not locale:
|
||||
i18n = I18n.get_current(no_error=True)
|
||||
if i18n:
|
||||
locale = i18n.current_locale
|
||||
else:
|
||||
locale = "en"
|
||||
try:
|
||||
obj = json.loads(text) # @IgnoreException
|
||||
except Exception:
|
||||
@@ -116,7 +123,7 @@ def get_entity_item_repr(
|
||||
|
||||
|
||||
def get_value_repr(
|
||||
value: Any, field_descriptor: EntityFieldDescriptor, locale: str | None = None
|
||||
value: Any, field_descriptor: FieldDescriptor, locale: str | None = None
|
||||
) -> str:
|
||||
if value is None:
|
||||
return ""
|
||||
@@ -157,7 +164,7 @@ def get_callable_str(
|
||||
| EntityItemCaptionCallable
|
||||
| EntityFieldCaptionCallable
|
||||
),
|
||||
descriptor: EntityFieldDescriptor | EntityDescriptor,
|
||||
descriptor: FieldDescriptor | EntityDescriptor,
|
||||
entity: Any = None,
|
||||
value: Any = None,
|
||||
) -> str:
|
||||
@@ -185,9 +192,17 @@ def get_entity_descriptor(
|
||||
|
||||
def get_field_descriptor(
|
||||
app: "QBotApp", callback_data: ContextData
|
||||
) -> EntityFieldDescriptor | None:
|
||||
) -> FieldDescriptor | None:
|
||||
if callback_data.context == CommandContext.SETTING_EDIT:
|
||||
return Settings.list_params()[callback_data.field_name]
|
||||
elif callback_data.context == CommandContext.COMMAND_FORM:
|
||||
command = app.bot_commands[callback_data.user_command.split("&")[0]]
|
||||
if (
|
||||
command
|
||||
and command.param_form
|
||||
and callback_data.field_name in command.param_form
|
||||
):
|
||||
return command.param_form[callback_data.field_name]
|
||||
elif callback_data.context in [
|
||||
CommandContext.ENTITY_CREATE,
|
||||
CommandContext.ENTITY_EDIT,
|
||||
|
||||
Reference in New Issue
Block a user