Verum/Otkritiebot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

а
Some checks failed
CI / Lint (ruff + mypy) (push) Failing after 32s
Details
CI / Run tests (push) Has been skipped
Details
CI / Docker build test (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Verum
2026-04-02 22:30:55 +07:00
parent 3871fd554b
commit fd45c1864e
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
session_bot/bot.py
View File

@@ -122,6 +122,8 @@ def extract_template_text(message: Message) -> str | None:
def normalize_template_placeholders(template: str) -> str: def normalize_template_placeholders(template: str) -> str:
normalized = template normalized = template
normalized = re.sub(r"<tg-emoji(\s+[^>]*?)emoji_id=", r"<tg-emoji\1emoji-id=", normalized, flags=re.IGNORECASE)
normalized = re.sub(r"<tg-emoji\s+emoji_id=", "<tg-emoji emoji-id=", normalized, flags=re.IGNORECASE)
normalized = re.sub(r"\\\{\\\{\s*actors\s*\\\}\\\}", "{{actors}}", normalized, flags=re.IGNORECASE) normalized = re.sub(r"\\\{\\\{\s*actors\s*\\\}\\\}", "{{actors}}", normalized, flags=re.IGNORECASE)
normalized = re.sub(r"\{\{\s*actors\s*\}\}", "{{actors}}", normalized, flags=re.IGNORECASE) normalized = re.sub(r"\{\{\s*actors\s*\}\}", "{{actors}}", normalized, flags=re.IGNORECASE)
normalized = re.sub( normalized = re.sub(
@@ -205,6 +207,12 @@ async def show_actor_status_menu(callback: CallbackQuery, actor: dict[str, Any],
async def update_channel_post(bot: Bot, app_config: dict, state_storage: JsonStateStorage, settings) -> None: async def update_channel_post(bot: Bot, app_config: dict, state_storage: JsonStateStorage, settings) -> None:
state = state_storage.load() state = state_storage.load()
if "template" in state and "text" in state["template"]:
normalized_template = normalize_template_placeholders(state["template"]["text"])
if normalized_template != state["template"]["text"]:
state["template"]["text"] = normalized_template
state_storage.save(state)
link_preview_options = None link_preview_options = None
if app_config.get("hidden_link_url", "").strip(): if app_config.get("hidden_link_url", "").strip():
link_preview_options = LinkPreviewOptions( link_preview_options = LinkPreviewOptions(
@@ -272,6 +280,11 @@ def save_post_template(state_storage: JsonStateStorage, template: str) -> None:
async def send_test_post(bot: Bot, chat_id: int, app_config: dict, state_storage: JsonStateStorage) -> None: async def send_test_post(bot: Bot, chat_id: int, app_config: dict, state_storage: JsonStateStorage) -> None:
state = state_storage.load() state = state_storage.load()
if "template" in state and "text" in state["template"]:
normalized_template = normalize_template_placeholders(state["template"]["text"])
if normalized_template != state["template"]["text"]:
state["template"]["text"] = normalized_template
state_storage.save(state)
text = build_channel_text(app_config, state) text = build_channel_text(app_config, state)
link_preview_options = None link_preview_options = None
if app_config.get("hidden_link_url", "").strip(): if app_config.get("hidden_link_url", "").strip():