chore: minor fixes and formatting
This commit is contained in:
@@ -1,12 +1,11 @@
|
||||
from typing import Optional
|
||||
import hashlib
|
||||
|
||||
from aiogram import Router, F
|
||||
from aiogram import F, Router
|
||||
from aiogram.fsm.context import FSMContext
|
||||
from aiogram.types import CallbackQuery, Message
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from config import PAGE_SIZE
|
||||
from config import PAGE_SIZE, VERIFIED_ACCOUNTS
|
||||
from misc.kb.client import render_products
|
||||
from misc.kb.common import return_menu
|
||||
from misc.redis import RedisClient
|
||||
@@ -20,7 +19,7 @@ router = Router()
|
||||
async def search_trigger(cb: CallbackQuery, state: FSMContext):
|
||||
await state.clear()
|
||||
|
||||
await cb.message.edit_text("🔍 Введите запрос:", reply_markup=return_menu)
|
||||
await cb.message.edit_text("<b>🔍 Введите запрос:</b>", reply_markup=return_menu)
|
||||
await state.set_state(SearchStorage.query)
|
||||
await state.set_data({"msg": cb.message})
|
||||
|
||||
@@ -37,11 +36,13 @@ async def searching(
|
||||
await state.clear()
|
||||
|
||||
await msg.delete()
|
||||
orig_msg: Optional[Message] = data.get("msg") or await msg.answer("⏳")
|
||||
orig_msg: Message | None = data.get("msg") or await msg.answer("⏳")
|
||||
await orig_msg.edit_text("⏳ Поиск...")
|
||||
is_admin = msg.from_user.id in VERIFIED_ACCOUNTS
|
||||
results = await products_repo.search(
|
||||
session,
|
||||
msg.text,
|
||||
include_hidden=is_admin,
|
||||
)
|
||||
|
||||
next_cb = None
|
||||
@@ -51,12 +52,13 @@ async def searching(
|
||||
next_cb = f"search:{query_hash}:1"
|
||||
|
||||
await orig_msg.edit_text(
|
||||
"here",
|
||||
"<b>🗒 Результаты поиска:</b>",
|
||||
reply_markup=render_products(
|
||||
results[:PAGE_SIZE],
|
||||
product_cb_factory=lambda p: f"product:{p.id}",
|
||||
back_cb="menu:main",
|
||||
next_cb=next_cb,
|
||||
is_admin=is_admin,
|
||||
),
|
||||
)
|
||||
|
||||
@@ -79,7 +81,13 @@ async def search_pagination(
|
||||
if not query:
|
||||
await cb.message.edit_text("🍃 Попробуйте ещё раз...")
|
||||
|
||||
results = await products_repo.search(session, query, offset=PAGE_SIZE * page)
|
||||
is_admin = cb.from_user.id in VERIFIED_ACCOUNTS
|
||||
results = await products_repo.search(
|
||||
session,
|
||||
query,
|
||||
offset=PAGE_SIZE * page,
|
||||
include_hidden=is_admin,
|
||||
)
|
||||
|
||||
await cb.message.edit_reply_markup(
|
||||
reply_markup=render_products(
|
||||
@@ -88,5 +96,6 @@ async def search_pagination(
|
||||
back_cb="menu:main",
|
||||
next_cb=f"search:{q_hash}:{page + 1}" if len(results) > PAGE_SIZE else None,
|
||||
prev_cb=f"search:{q_hash}:{page - 1}" if page > 0 else None,
|
||||
is_admin=is_admin,
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user