Archived
feat(bot): add async DB and FSM state handling
This commit is contained in:
@@ -14,11 +14,11 @@ async def build_inventory_menu(bot_name: str) -> tuple[str, object]:
|
||||
cs2_assets = []
|
||||
steam_assets = []
|
||||
try:
|
||||
cs2_assets = cs2_inventory.get(bot_name, {}).get("Assets", []) # type: ignore[union-attr]
|
||||
cs2_assets = cs2_inventory.get(bot_name, {}).get("Assets", [])
|
||||
except Exception:
|
||||
logger.exception("Ошибка чтения CS2-инвентаря: bot=%s", bot_name)
|
||||
try:
|
||||
steam_assets = steam_inventory.get(bot_name, {}).get("Assets", []) # type: ignore[union-attr]
|
||||
steam_assets = steam_inventory.get(bot_name, {}).get("Assets", [])
|
||||
except Exception:
|
||||
logger.exception("Ошибка чтения Steam-инвентаря: bot=%s", bot_name)
|
||||
if not cs2_assets and not steam_assets:
|
||||
@@ -67,7 +67,9 @@ async def render_inventory_page(
|
||||
assets = bot_inventory.get("Assets", [])
|
||||
descriptions = bot_inventory.get("Descriptions", [])
|
||||
if not assets:
|
||||
logger.info("Инвентарь выбранного типа пуст: bot=%s type=%s", bot_name, inventory_type)
|
||||
logger.info(
|
||||
"Инвентарь выбранного типа пуст: bot=%s type=%s", bot_name, inventory_type
|
||||
)
|
||||
return f"Инвентарь {bot_name} пуст", inventory_menu_keyboard(bot_name, 0, 0)
|
||||
desc_map = {}
|
||||
for desc in descriptions:
|
||||
@@ -87,7 +89,7 @@ async def render_inventory_page(
|
||||
for asset in page_assets:
|
||||
key = (str(asset.get("classid")), str(asset.get("instanceid")))
|
||||
desc = desc_map.get(key, {})
|
||||
name = desc.get("market_name", "Unknown")
|
||||
name = desc.get("market_name", "Неизвестно")
|
||||
amount = asset.get("amount", 1)
|
||||
tradable = "🔄" if desc.get("tradable") else "❌"
|
||||
marketable = "💰" if desc.get("marketable") else "🔒"
|
||||
@@ -105,12 +107,14 @@ async def render_inventory_page(
|
||||
elif icon == "💎":
|
||||
gems_count += amount
|
||||
lines.append(f"{icon} {tradable}{marketable} {name} x{amount}")
|
||||
|
||||
inv_name = "CS2" if appid == 730 else "Steam"
|
||||
stats = (
|
||||
f"📦 Предметов: {len(assets)}\n"
|
||||
f"💰 Можно продать: {marketable_count}\n"
|
||||
f"🔄 Можно трейдить: {tradable_count}"
|
||||
)
|
||||
|
||||
if appid == 753:
|
||||
stats += (
|
||||
f"\n🎏 Карточек: {cards_count}"
|
||||
@@ -118,11 +122,13 @@ async def render_inventory_page(
|
||||
f"\n🖼 Фонов: {backgrounds_count}"
|
||||
f"\n💎 Самоцветов: {gems_count}"
|
||||
)
|
||||
|
||||
text = (
|
||||
f"📦 {inv_name} Inventory {bot_name}\n"
|
||||
f"📦 Инвентарь {inv_name} {bot_name}\n"
|
||||
f"📄 Страница {page + 1}/{total_pages}\n\n"
|
||||
f"{stats}\n\n" + "\n".join(lines)
|
||||
)
|
||||
|
||||
logger.info(
|
||||
"Страница инвентаря сформирована: bot=%s type=%s page=%s total_pages=%s items_on_page=%s",
|
||||
bot_name,
|
||||
@@ -131,6 +137,7 @@ async def render_inventory_page(
|
||||
total_pages,
|
||||
len(page_assets),
|
||||
)
|
||||
|
||||
return text[:4000], inventory_page_keyboard(
|
||||
inventory_type, bot_name, page, total_pages
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user