diff --git a/bot/bot_templates/main.txt b/bot/bot_templates/main.txt index eca3816..3051763 100644 --- a/bot/bot_templates/main.txt +++ b/bot/bot_templates/main.txt @@ -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 diff --git a/component/models.py b/component/models.py index 8752ef3..3f1b5dd 100644 --- a/component/models.py +++ b/component/models.py @@ -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(