From 602850787454746ba1006a41e6b556700070d3d4 Mon Sep 17 00:00:00 2001 From: h Date: Thu, 1 Oct 2026 02:01:58 +0200 Subject: [PATCH] fix(api,userbot): clean app.py ending for every option set, handlers typed for current ty --- .../app.py.jinja | 12 ++++++++---- .../handlers/echo.py.jinja | 9 ++++----- .../handlers/private/pm_message.py.jinja | 9 ++++----- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/template/{{ part_dir }}/src/{% if 'api' in backend_services %}api{% endif %}/app.py.jinja b/template/{{ part_dir }}/src/{% if 'api' in backend_services %}api{% endif %}/app.py.jinja index e8c0734..2dd6e98 100644 --- a/template/{{ part_dir }}/src/{% if 'api' in backend_services %}api{% endif %}/app.py.jinja +++ b/template/{{ part_dir }}/src/{% if 'api' in backend_services %}api{% endif %}/app.py.jinja @@ -40,7 +40,8 @@ app.add_middleware( ) app.include_router(routers.router) -{% if serve_spa %} +{%- if serve_spa %} + spa_dir = Path(env.api.static_dir).resolve() if spa_dir.is_dir(): @@ -52,6 +53,9 @@ if spa_dir.is_dir(): headers = IMMUTABLE_HEADERS if immutable else NO_CACHE_HEADERS return FileResponse(candidate, headers=headers) return FileResponse(spa_dir / "index.html", headers=NO_CACHE_HEADERS) -{% endif %} -{% if use_dishka %}setup_dishka(container, app) -{% endif %} +{%- endif %} +{%- if use_dishka %} + +{% if serve_spa %} +{% endif %}setup_dishka(container, app) +{%- endif %} diff --git a/template/{{ part_dir }}/src/{% if 'kurigram_userbot' in backend_services %}userbot{% endif %}/handlers/echo.py.jinja b/template/{{ part_dir }}/src/{% if 'kurigram_userbot' in backend_services %}userbot{% endif %}/handlers/echo.py.jinja index 4243261..a026d7c 100644 --- a/template/{{ part_dir }}/src/{% if 'kurigram_userbot' in backend_services %}userbot{% endif %}/handlers/echo.py.jinja +++ b/template/{{ part_dir }}/src/{% if 'kurigram_userbot' in backend_services %}userbot{% endif %}/handlers/echo.py.jinja @@ -1,12 +1,11 @@ -from pyrogram import filters, types +from pyrogram import Client, filters, types +from pyrogram.handlers import MessageHandler -from userbot import PyroClient from utils.logging import logger -@PyroClient.on_message(filters.me) -async def echo(_: PyroClient, message: types.Message) -> None: +async def echo(_: Client, message: types.Message) -> None: logger.info(f"[cyan]me:[/] {message.text}") -handlers = echo.handlers +handlers = [(MessageHandler(echo, filters.me), 0)] diff --git a/template/{{ part_dir }}/src/{% if 'kurigram_userbot' in backend_services %}userbot{% endif %}/handlers/private/pm_message.py.jinja b/template/{{ part_dir }}/src/{% if 'kurigram_userbot' in backend_services %}userbot{% endif %}/handlers/private/pm_message.py.jinja index def4bfd..00eda38 100644 --- a/template/{{ part_dir }}/src/{% if 'kurigram_userbot' in backend_services %}userbot{% endif %}/handlers/private/pm_message.py.jinja +++ b/template/{{ part_dir }}/src/{% if 'kurigram_userbot' in backend_services %}userbot{% endif %}/handlers/private/pm_message.py.jinja @@ -1,13 +1,12 @@ -from pyrogram import filters, types +from pyrogram import Client, filters, types +from pyrogram.handlers import MessageHandler -from userbot import PyroClient from utils.logging import logger -@PyroClient.on_message(filters.private & ~filters.me) -async def pm_message(_: PyroClient, message: types.Message) -> None: +async def pm_message(_: Client, message: types.Message) -> None: sender = message.from_user.id if message.from_user else "unknown" logger.info(f"[green]pm from {sender}:[/] {message.text}") -handlers = pm_message.handlers +handlers = [(MessageHandler(pm_message, filters.private & ~filters.me), 0)]