Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
altlinux-packages-bot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Unitsaev
altlinux-packages-bot
Commits
9095e4aa
Verified
Commit
9095e4aa
authored
Jul 15, 2025
by
Kirill Unitsaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
all modules: fix handlesr args and rules
parent
c5661b9f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
21 deletions
+9
-21
bugs.py
src/handlers/bugs.py
+1
-1
profile.py
src/handlers/profile.py
+2
-3
search.py
src/handlers/search.py
+0
-1
start.py
src/handlers/start.py
+2
-2
statistics.py
src/handlers/statistics.py
+3
-13
watch.py
src/handlers/watch.py
+1
-1
No files found.
src/handlers/bugs.py
View file @
9095e4aa
...
@@ -14,7 +14,7 @@ dp = Dispatch()
...
@@ -14,7 +14,7 @@ dp = Dispatch()
@dp.message
(
Command
(
"bugs"
,
Argument
(
"maintainer"
,
optional
=
True
)))
@dp.message
(
Command
(
"bugs"
,
Argument
(
"maintainer"
,
optional
=
True
)))
@dp.message
(
Text
([
"bugs"
,
"ошибки"
],
ignore_case
=
True
),
IsPrivate
())
@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
:
if
maintainer
:
maintainer
=
maintainer
.
lower
()
maintainer
=
maintainer
.
lower
()
...
...
src/handlers/profile.py
View file @
9095e4aa
from
telegrinder
import
Dispatch
,
Message
,
CallbackQuery
,
MESSAGE_FROM_USER
,
WaiterMachine
from
telegrinder
import
Dispatch
,
Message
,
CallbackQuery
,
MESSAGE_FROM_USER
,
WaiterMachine
from
telegrinder.rules
import
Command
,
PayloadEqRule
,
PayloadMarkupRule
,
Text
,
Is
User
,
HasText
from
telegrinder.rules
import
Command
,
PayloadEqRule
,
PayloadMarkupRule
,
Text
,
Is
Private
,
HasText
from
database.func
import
DB
from
database.func
import
DB
from
data.keyboards
import
profile_keyboards
from
data.keyboards
import
profile_keyboards
...
@@ -14,7 +14,6 @@ from database.models import User
...
@@ -14,7 +14,6 @@ from database.models import User
dp
=
Dispatch
()
dp
=
Dispatch
()
wm
=
WaiterMachine
(
dp
)
wm
=
WaiterMachine
(
dp
)
dp
.
message
.
auto_rules
=
IsUser
()
@dp.message
(
Command
(
"profile"
)
|
Text
([
"profile"
,
"профиль"
],
ignore_case
=
True
))
@dp.message
(
Command
(
"profile"
)
|
Text
([
"profile"
,
"профиль"
],
ignore_case
=
True
))
async
def
profile_handler
(
m
:
Message
,
user
:
User
|
None
)
->
None
:
async
def
profile_handler
(
m
:
Message
,
user
:
User
|
None
)
->
None
:
...
@@ -103,6 +102,6 @@ async def callback_confirm_handler(cb: CallbackQuery, branch: str) -> None:
...
@@ -103,6 +102,6 @@ async def callback_confirm_handler(cb: CallbackQuery, branch: str) -> None:
async
def
menu_handler
(
cb
:
CallbackQuery
,
user
:
User
|
None
):
async
def
menu_handler
(
cb
:
CallbackQuery
,
user
:
User
|
None
):
send_menu
(
cb
,
user
)
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
):
async
def
menu_handler
(
m
:
Message
,
user
:
User
|
None
):
await
send_menu
(
m
,
user
)
await
send_menu
(
m
,
user
)
src/handlers/search.py
View file @
9095e4aa
...
@@ -8,7 +8,6 @@ from database.models import User
...
@@ -8,7 +8,6 @@ from database.models import User
from
collections
import
defaultdict
from
collections
import
defaultdict
from
api
import
api
from
api
import
api
from
api.models
import
FilesModel
,
PackageByFileNameModel
dp
=
Dispatch
()
dp
=
Dispatch
()
wm
=
WaiterMachine
(
dp
)
wm
=
WaiterMachine
(
dp
)
...
...
src/handlers/start.py
View file @
9095e4aa
from
telegrinder
import
MESSAGE_FROM_USER
,
Dispatch
,
Message
,
WaiterMachine
from
telegrinder
import
MESSAGE_FROM_USER
,
Dispatch
,
Message
,
WaiterMachine
from
telegrinder.rules
import
StartCommand
,
HasText
,
Is
User
from
telegrinder.rules
import
StartCommand
,
HasText
,
Is
Private
from
database.func
import
DB
from
database.func
import
DB
from
database.models
import
User
from
database.models
import
User
...
@@ -14,7 +14,7 @@ from config import DEFAUIL_BRANCHES
...
@@ -14,7 +14,7 @@ from config import DEFAUIL_BRANCHES
dp
=
Dispatch
()
dp
=
Dispatch
()
wm
=
WaiterMachine
(
dp
)
wm
=
WaiterMachine
(
dp
)
dp
.
message
.
auto_rules
=
Is
User
()
dp
.
message
.
auto_rules
=
Is
Private
()
@dp.message
(
StartCommand
())
@dp.message
(
StartCommand
())
async
def
start_handler
(
m
:
Message
,
user
:
User
|
None
)
->
None
:
async
def
start_handler
(
m
:
Message
,
user
:
User
|
None
)
->
None
:
...
...
src/handlers/statistics.py
View file @
9095e4aa
from
telegrinder
import
MESSAGE_FROM_USER
,
Dispatch
,
Message
,
WaiterMachine
,
CallbackQuery
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
from
datetime
import
datetime
import
locale
import
locale
...
@@ -14,8 +14,8 @@ dp = Dispatch()
...
@@ -14,8 +14,8 @@ dp = Dispatch()
wm
=
WaiterMachine
(
dp
)
wm
=
WaiterMachine
(
dp
)
@dp.message
(
Command
(
"statistics"
,
Argument
(
"branch"
,
optional
=
True
)))
@dp.message
(
Command
(
"statistics"
,
Argument
(
"branch"
,
optional
=
True
)))
@dp.message
(
Text
([
"statistics"
,
"статистика"
],
ignore_case
=
True
),
Is
User
())
@dp.message
(
Text
([
"statistics"
,
"статистика"
],
ignore_case
=
True
),
Is
Private
())
async
def
profile
_handler
(
m
:
Message
,
user
:
User
|
None
,
branch
:
str
|
None
=
None
)
->
None
:
async
def
statistics
_handler
(
m
:
Message
,
user
:
User
|
None
,
branch
:
str
|
None
=
None
)
->
None
:
active_branches
=
(
await
api
.
packageset
.
active_packagesets
())
.
packagesets
active_branches
=
(
await
api
.
packageset
.
active_packagesets
())
.
packagesets
if
branch
:
if
branch
:
...
@@ -44,13 +44,3 @@ async def profile_handler(m: Message, user: User | None, branch: str | None = No
...
@@ -44,13 +44,3 @@ async def profile_handler(m: Message, user: User | None, branch: str | None = No
await
m
.
answer
(
await
m
.
answer
(
statistics_message
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
)
src/handlers/watch.py
View file @
9095e4aa
...
@@ -12,7 +12,7 @@ dp = Dispatch()
...
@@ -12,7 +12,7 @@ dp = Dispatch()
@dp.message
(
Command
(
"watch"
,
Argument
(
"maintainer"
,
optional
=
True
)))
@dp.message
(
Command
(
"watch"
,
Argument
(
"maintainer"
,
optional
=
True
)))
@dp.message
(
Text
([
"watch"
,
"отслеживание"
],
ignore_case
=
True
),
IsUser
())
@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
:
if
maintainer
:
maintainer
=
maintainer
.
lower
()
maintainer
=
maintainer
.
lower
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment