v1.6.0: max_bot fixes — feature keys, flush→commit, test-run, categories, broadcast page, proxy error handling, deploy scripts
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
import re
|
||||
from app.settings_cache import SettingsCache
|
||||
from app.conversation import get_or_create_user, get_template_rendered
|
||||
from app.fsm import BotState, FSM
|
||||
|
||||
|
||||
async def handle_contact_provided(bot, user_data: dict, db, max_api):
|
||||
max_user_id = user_data["user_id"]
|
||||
user = await get_or_create_user(db, max_user_id)
|
||||
|
||||
phone = user_data.get("phone", "")
|
||||
email = user_data.get("email", "")
|
||||
|
||||
if phone:
|
||||
user.phone = phone
|
||||
if email:
|
||||
user.email = email
|
||||
await db.flush()
|
||||
|
||||
text = await get_template_rendered(db, "inquiry_request")
|
||||
await max_api.send_message(max_user_id, text, format="markdown")
|
||||
FSM.set_state(max_user_id, BotState.INQUIRY_REQUEST)
|
||||
|
||||
|
||||
async def handle_contact_text(bot, user_data: dict, db, max_api):
|
||||
max_user_id = user_data["user_id"]
|
||||
text = user_data.get("text", "").strip()
|
||||
user = await get_or_create_user(db, max_user_id)
|
||||
|
||||
phone_match = re.search(r'(\+?7[\s\-\(]?\d{3}[\s\-\)]?\d{3}[\s\-]?\d{2}[\s\-]?\d{2})', text)
|
||||
email_match = re.search(r'([\w.-]+@[\w.-]+\.\w+)', text)
|
||||
|
||||
if phone_match:
|
||||
user.phone = phone_match.group(1)
|
||||
if email_match:
|
||||
user.email = email_match.group(1)
|
||||
|
||||
if phone_match or email_match:
|
||||
await db.flush()
|
||||
await handle_contact_provided(bot, user_data, db, max_api)
|
||||
return
|
||||
|
||||
await max_api.send_message(max_user_id, "Пожалуйста, укажите номер телефона или email, чтобы мы могли с вами связаться.")
|
||||
Reference in New Issue
Block a user