Skip to content

Add "forever" keyword for !ro and !ban #10 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samuelfirst wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add "forever" keyword for !ro and !ban #10 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions aiogram_bot/handlers/simple_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import asyncio
import datetime
from contextlib import suppress
from typing import List, Optional

Expand Down Expand Up @@ -84,12 +85,16 @@ async def cmd_ro(message: types.Message, chat: Chat):
logger.error("Failed to restrict chat member: {error!r}", error=e)
return False

if duration >= datetime.timedelta(days=367):
duration = "forever"
else:
duration = format_timedelta(
duration, locale=chat.language, granularity="seconds", format="short"
)

await message.reply_to_message.answer(
_("<b>Read-only</b> activated for user {user}. Duration: {duration}").format(
user=message.reply_to_message.from_user.get_mention(),
duration=format_timedelta(
duration, locale=chat.language, granularity="seconds", format="short"
),
user=message.reply_to_message.from_user.get_mention(), duration=duration
)
)
return True
Expand Down Expand Up @@ -120,12 +125,16 @@ async def cmd_ban(message: types.Message, chat: Chat):
logger.error("Failed to kick chat member: {error!r}", error=e)
return False

if duration >= datetime.timedelta(days=367):
duration = "forever"
else:
duration = format_timedelta(
duration, locale=chat.language, granularity="seconds", format="short"
)

await message.reply_to_message.answer(
_("User {user} <b>banned</b> for {duration}").format(
user=message.reply_to_message.from_user.get_mention(),
duration=format_timedelta(
duration, locale=chat.language, granularity="seconds", format="short"
),
user=message.reply_to_message.from_user.get_mention(), duration=duration
)
)
return True
Expand Down
6 changes: 4 additions & 2 deletions aiogram_bot/utils/timedelta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

from aiogram import types

PATTERN = re.compile(r"(?P<value>\d+)(?P<modifier>[wdhms])")
LINE_PATTERN = re.compile(r"^(\d+[wdhms]){1,}$")
PATTERN = re.compile(r"(?P<value>\d+)(?P<modifier>[wdhms])|^(?P<keyword>forever)$")
LINE_PATTERN = re.compile(r"^(\d+[wdhms])+$|^(forever)$")

MODIFIERS = {
"w": datetime.timedelta(weeks=1),
Expand All @@ -26,6 +26,8 @@ def parse_timedelta(value: str) -> datetime.timedelta:
raise TimedeltaParseError("Invalid time format")

try:
if PATTERN.match(value).group("keyword"):
return datetime.timedelta(days=367)
result = datetime.timedelta()
for match in PATTERN.finditer(value):
value, modifier = match.groups()
Expand Down