Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions bot/bot_templates/main.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import asyncio
import logging
from aiogram import Bot, Dispatcher, F
import re
from aiogram.types import Message
from aiogram.client.session.aiohttp import AiohttpSession
from aiogram.fsm.storage.memory import MemoryStorage
Expand Down
9 changes: 6 additions & 3 deletions component/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,12 @@ def generate_code(self) -> str:

filters = []
if underlying_object.text:
filters.append(
f"F.text{'.lower()' if underlying_object.case_sensitive else ''} == '{underlying_object.text}'",
)
if underlying_object.regex:
filters.append(f"regexp=re.compile(r'{underlying_object.text})'")
else:
filters.append(
f"F.text{'.lower()' if underlying_object.case_sensitive else ''} == '{underlying_object.text}'",
)
if underlying_object.state:
state_list = [f"'{s.strip()}'" for s in underlying_object.state.split(",")]
filters.append(
Expand Down