add user attr to delegates' context
This commit is contained in:
@@ -71,6 +71,7 @@ async def bool_editor(
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=kwargs["app"],
|
app=kwargs["app"],
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,11 @@ async def show_editor(message: Message | CallbackQuery, **kwargs):
|
|||||||
)
|
)
|
||||||
|
|
||||||
context = BotContext(
|
context = BotContext(
|
||||||
db_session=db_session, app=app, app_state=kwargs["app_state"], message=message
|
db_session=db_session,
|
||||||
|
app=app,
|
||||||
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
if field_descriptor.edit_prompt:
|
if field_descriptor.edit_prompt:
|
||||||
|
|||||||
@@ -162,6 +162,7 @@ async def time_picker(
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=kwargs["app"],
|
app=kwargs["app"],
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -283,6 +284,7 @@ async def date_picker(
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=kwargs["app"],
|
app=kwargs["app"],
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -385,6 +387,7 @@ async def date_picker_year(
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=app,
|
app=app,
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=query,
|
message=query,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -199,6 +199,7 @@ async def render_entity_picker(
|
|||||||
db_session=db_session,
|
db_session=db_session,
|
||||||
app=kwargs["app"],
|
app=kwargs["app"],
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -142,6 +142,7 @@ async def field_editor(message: Message | CallbackQuery, **kwargs):
|
|||||||
db_session=db_session,
|
db_session=db_session,
|
||||||
app=app,
|
app=app,
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
field_sequence = await build_field_sequence(
|
field_sequence = await build_field_sequence(
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ async def _validate_value(
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=kwargs["app"],
|
app=kwargs["app"],
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=kwargs["user"],
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
if iscoroutinefunction(field_descriptor.validator):
|
if iscoroutinefunction(field_descriptor.validator):
|
||||||
@@ -220,6 +221,7 @@ async def process_field_edit_callback(message: Message | CallbackQuery, **kwargs
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=kwargs["app"],
|
app=kwargs["app"],
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
field_sequence = await build_field_sequence(
|
field_sequence = await build_field_sequence(
|
||||||
@@ -337,6 +339,7 @@ async def process_field_edit_callback(message: Message | CallbackQuery, **kwargs
|
|||||||
db_session=db_session,
|
db_session=db_session,
|
||||||
app=app,
|
app=app,
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ async def string_editor(
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=kwargs["app"],
|
app=kwargs["app"],
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -98,7 +98,11 @@ async def entity_item(
|
|||||||
)
|
)
|
||||||
|
|
||||||
context = BotContext(
|
context = BotContext(
|
||||||
db_session=db_session, app=app, app_state=kwargs["app_state"], message=query
|
db_session=db_session,
|
||||||
|
app=app,
|
||||||
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
|
message=query,
|
||||||
)
|
)
|
||||||
|
|
||||||
if form.form_buttons:
|
if form.form_buttons:
|
||||||
|
|||||||
@@ -50,7 +50,11 @@ async def entity_delete_callback(query: CallbackQuery, **kwargs):
|
|||||||
)
|
)
|
||||||
|
|
||||||
context = BotContext(
|
context = BotContext(
|
||||||
db_session=db_session, app=app, app_state=kwargs["app_state"], message=query
|
db_session=db_session,
|
||||||
|
app=app,
|
||||||
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
|
message=query,
|
||||||
)
|
)
|
||||||
|
|
||||||
if callback_data.data == "yes":
|
if callback_data.data == "yes":
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ async def entity_list(
|
|||||||
db_session=db_session,
|
db_session=db_session,
|
||||||
app=app,
|
app=app,
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ async def entities_menu(
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=app,
|
app=app,
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=kwargs["user"],
|
||||||
message=message,
|
message=message,
|
||||||
),
|
),
|
||||||
descriptor=entity,
|
descriptor=entity,
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ async def parameters_menu(
|
|||||||
db_session=kwargs["db_session"],
|
db_session=kwargs["db_session"],
|
||||||
app=kwargs["app"],
|
app=kwargs["app"],
|
||||||
app_state=kwargs["app_state"],
|
app_state=kwargs["app_state"],
|
||||||
|
user=user,
|
||||||
message=message,
|
message=message,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -234,10 +234,11 @@ class CommandCallbackContext[UT: UserBase]:
|
|||||||
|
|
||||||
|
|
||||||
@dataclass(kw_only=True)
|
@dataclass(kw_only=True)
|
||||||
class BotContext:
|
class BotContext[UT: UserBase]:
|
||||||
db_session: AsyncSession
|
db_session: AsyncSession
|
||||||
app: "QBotApp"
|
app: "QBotApp"
|
||||||
app_state: State
|
app_state: State
|
||||||
|
user: UT
|
||||||
message: Message | CallbackQuery | None = None
|
message: Message | CallbackQuery | None = None
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user