From 704b07fbf8bc9371c1f50c132326ea2d9fc2b2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=A5=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= <xpamych@yandex.ru>
Date: Wed, 29 May 2024 22:42:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D1=84=D0=B8=D0=BA=D1=81?=
 =?UTF-8?q?=D1=8B=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 news-bot.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/news-bot.py b/news-bot.py
index 0389c97..838628e 100755
--- a/news-bot.py
+++ b/news-bot.py
@@ -35,7 +35,7 @@ params_get = {
 }
 
 logger = logging.getLogger()
-logger.setLevel(logging.INFO)
+logger.setLevel(logging.DEBUG)
 
 handler = colorlog.StreamHandler()
 handler.setFormatter(colorlog.ColoredFormatter(
@@ -83,12 +83,14 @@ def html_to_text(html_content):
     # Убираем переносы строк внутри квадратных скобок []
     markdown_text = re.sub(r'\[(.*?)\]', lambda x: '[' + x.group(1).replace('\n', ' ') + ']', markdown_text, flags=re.DOTALL)
 
-    # Удаление переносов строк и пробелов внутри текста
-    markdown_text = re.sub(r'(?<!\n)\n(?!\n)', ' ', markdown_text)
+    # # Удаление переносов строк и пробелов внутри текста
+    # markdown_text = re.sub(r'(?<!\n)\n(?!\n)', ' ', markdown_text)
 
     # Удаление строк, содержащих '* * *'
     markdown_text = re.sub(r'^.*\* \* \*.*$', '', markdown_text, flags=re.MULTILINE)
 
+    markdown_text = re.sub(r'^.*\*', '*', markdown_text, flags=re.MULTILINE)
+
     # Работа с #
     patterns_to_remove = [
         r'###',
@@ -167,7 +169,7 @@ def script_content(script_ver, resp_changelog):
 
         if index_script_ver != -1:
             changelog_text = changelog_text_last[index_script_ver:]
-            post_text = (f"-----------------------------\nОбновление скриптов {script_ver}\t\n") + changelog_text
+            post_text = (f"-----------------------------\n") + changelog_text
         site_text = (f"[center][img]/uploads/default/original/1X/5cfa59077a5275971401fab0114e56f3ffdd0ec4.png[/img]["
                      f"/center]\n{post_text}")
 
@@ -349,7 +351,7 @@ def check_discord_public():
                 for topic_id, topic_title in reversed(list_for_public):
                     text_data = news_content(topic_id)
                     if text_data:
-                        content = f"----------------------------------------------------------\n### {topic_title}\t\n" + text_data + "\n" + "@here"
+                        content = f"----------------------------------------------------------\n### {topic_title}\t\n" + text_data + "\n"
                         # Разбиваем содержимое на части по 4000 символов
                         for i in range(0, len(content), 2000):
                             await channel.send(content[i:i+2000])