all modules: fix handlesr args and rules

parent c5661b9f
......@@ -14,7 +14,7 @@ dp = Dispatch()
@dp.message(Command("bugs", Argument("maintainer", optional=True)))
@dp.message(Text(["bugs", "ошибки"], ignore_case=True), IsPrivate())
async def watch_handler(m: Message, user: User | None, maintainer: str | None) -> None:
async def bugs_handler(m: Message, user: User | None, maintainer: str | None = None) -> None:
if maintainer:
maintainer = maintainer.lower()
......
from telegrinder import Dispatch, Message, CallbackQuery, MESSAGE_FROM_USER, WaiterMachine
from telegrinder.rules import Command, PayloadEqRule, PayloadMarkupRule, Text, IsUser, HasText
from telegrinder.rules import Command, PayloadEqRule, PayloadMarkupRule, Text, IsPrivate, HasText
from database.func import DB
from data.keyboards import profile_keyboards
......@@ -14,7 +14,6 @@ from database.models import User
dp = Dispatch()
wm = WaiterMachine(dp)
dp.message.auto_rules = IsUser()
@dp.message(Command("profile") | Text(["profile", "профиль"], ignore_case=True))
async def profile_handler(m: Message, user: User | None) -> None:
......@@ -103,6 +102,6 @@ async def callback_confirm_handler(cb: CallbackQuery, branch: str) -> None:
async def menu_handler(cb: CallbackQuery, user: User | None):
send_menu(cb, user)
@dp.message(Command(["menu", "меню"]) | Text(["меню", "menu"]))
@dp.message(Command(["menu", "меню"]) | Text(["меню", "menu"]), IsPrivate())
async def menu_handler(m: Message, user: User | None):
await send_menu(m, user)
......@@ -8,7 +8,6 @@ from database.models import User
from collections import defaultdict
from api import api
from api.models import FilesModel, PackageByFileNameModel
dp = Dispatch()
wm = WaiterMachine(dp)
......
from telegrinder import MESSAGE_FROM_USER, Dispatch, Message, WaiterMachine
from telegrinder.rules import StartCommand, HasText, IsUser
from telegrinder.rules import StartCommand, HasText, IsPrivate
from database.func import DB
from database.models import User
......@@ -14,7 +14,7 @@ from config import DEFAUIL_BRANCHES
dp = Dispatch()
wm = WaiterMachine(dp)
dp.message.auto_rules = IsUser()
dp.message.auto_rules = IsPrivate()
@dp.message(StartCommand())
async def start_handler(m: Message, user: User | None) -> None:
......
from telegrinder import MESSAGE_FROM_USER, Dispatch, Message, WaiterMachine, CallbackQuery
from telegrinder.rules import Command, PayloadEqRule, Text, IsUser, Markup, Argument
from telegrinder.rules import Command, Text, IsPrivate, Argument
from datetime import datetime
import locale
......@@ -14,8 +14,8 @@ dp = Dispatch()
wm = WaiterMachine(dp)
@dp.message(Command("statistics", Argument("branch", optional=True)))
@dp.message(Text(["statistics", "статистика"], ignore_case=True), IsUser())
async def profile_handler(m: Message, user: User | None, branch: str | None = None) -> None:
@dp.message(Text(["statistics", "статистика"], ignore_case=True), IsPrivate())
async def statistics_handler(m: Message, user: User | None, branch: str | None = None) -> None:
active_branches = (await api.packageset.active_packagesets()).packagesets
if branch:
......@@ -44,13 +44,3 @@ async def profile_handler(m: Message, user: User | None, branch: str | None = No
await m.answer(
statistics_message
)
@dp.callback_query(PayloadEqRule("command/menu"), IsUser())
async def menu_handler(cb: CallbackQuery, user: User | None):
send_menu(cb, user)
@dp.message(Command(["menu", "меню"]) | Text(["меню", "menu"]), IsUser())
async def menu_handler(m: Message, user: User | None):
await send_menu(m, user)
......@@ -12,7 +12,7 @@ dp = Dispatch()
@dp.message(Command("watch", Argument("maintainer", optional=True)))
@dp.message(Text(["watch", "отслеживание"], ignore_case=True), IsUser())
async def watch_handler(m: Message, user: User | None, maintainer: str | None) -> None:
async def watch_handler(m: Message, user: User | None, maintainer: str | None = None) -> None:
if maintainer:
maintainer = maintainer.lower()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment