Возможность отправлять сообщения в конкретную тему Telegram-группы

sportorg/gui/dialogs/telegram_dialog.py

@@ -44,6 +44,10 @@ def init_ui(self):
         self.item_chat_id = QLineEdit()
         self.layout.addRow(self.label_chat_id, self.item_chat_id)
 
+        self.label_thread_id = QLabel(translate('Thread id'))
+        self.item_thread_id = QLineEdit()
+        self.layout.addRow(self.label_thread_id, self.item_thread_id)
+
         self.label_template = QLabel(translate('Template'))
         self.item_template = QTextEdit()
         self.item_template.setMinimumHeight(150)
@@ -89,13 +93,15 @@ def set_values(self):
         obj = race()
         token = obj.get_setting('telegram_token', '')
         url = obj.get_setting('telegram_chat_id', '')
+        thread_id = obj.get_setting('telegram_thread_id', '')
         parse_mode = obj.get_setting('telegram_parse_mode', '')
         template = obj.get_setting(
             'telegram_template', '{group} {name} {bib} {result} {place}'
         )
         telegram_enabled = obj.get_setting('telegram_enabled', False)
 
         self.item_chat_id.setText(url)
+        self.item_thread_id.setText(thread_id)
         self.item_token.setText(token)
         self.item_template.setText(template)
         self.item_enabled.setChecked(telegram_enabled)
@@ -117,6 +123,7 @@ def apply_changes_impl(self):
         obj = race()
         obj.set_setting('telegram_token', self.item_token.text())
         obj.set_setting('telegram_chat_id', self.item_chat_id.text())
+        obj.set_setting('telegram_thread_id', self.item_thread_id.text())
         obj.set_setting('telegram_enabled', self.item_enabled.isChecked())
         obj.set_setting('telegram_parse_mode', parse_mode)
         obj.set_setting('telegram_template', self.item_template.toPlainText())

sportorg/libs/telegram/telegram.py

@@ -10,12 +10,18 @@ def __init__(self, bot_token: str):
     def _get_api_url(self, path: str = '') -> str:
         return '{}bot{}/{}'.format(self.URL, self._bot_token, path)
 
-    def send_message(self, chat_id: str, text: str, parse_mode: str = ''):
+    def send_message(
+        self, chat_id: str, text: str, parse_mode: str = '', thread_id: str = ''
+    ):
         json_data = {
             'chat_id': chat_id,
             'text': text,
         }
+
         if parse_mode in ['Markdown', 'HTML']:
             json_data['parse_mode'] = parse_mode
 
+        if thread_id != '':
+            json_data['message_thread_id'] = thread_id
+
         return requests.post(self._get_api_url('sendMessage'), json=json_data)

sportorg/modules/telegram/telegram.py

@@ -8,27 +8,31 @@
 
 
 class TelegramSendThread(Thread):
-    def __init__(self, token, chat_id, text, parse_mode=''):
+    def __init__(self, token, chat_id, text, parse_mode='', thread_id=''):
         super().__init__(daemon=True)
         self.setName('TelegramSendThread')
         self.token = token
         self.chat_id = chat_id
+        self.thread_id = thread_id
         self.text = text
         self.parse_mode = parse_mode
 
     def run(self):
         try:
             sys.stdout = FakeStd()
             sys.stderr = FakeStd()
-            Telegram(self.token).send_message(self.chat_id, self.text, self.parse_mode)
+            Telegram(self.token).send_message(
+                self.chat_id, self.text, self.parse_mode, self.thread_id
+            )
         except Exception as e:
             logging.error(str(e))
 
 
 class BotOption:
-    def __init__(self, token, chat_id, template, parse_mode, enabled=False):
+    def __init__(self, token, chat_id, template, parse_mode, thread_id, enabled=False):
         self.token = token
         self.chat_id = chat_id
+        self.thread_id = thread_id
         self.template = template
         self.parse_mode = parse_mode
         self.enabled = enabled
@@ -43,6 +47,7 @@ def get_options():
             obj.get_setting('telegram_chat_id', ''),
             obj.get_setting('telegram_template', ''),
             obj.get_setting('telegram_parse_mode', ''),
+            obj.get_setting('telegram_thread_id', ''),
             obj.get_setting('telegram_enabled', False),
         )
 
@@ -72,7 +77,7 @@ def send(self, data_dict):
             logging.error(str(e))
         logging.info('Telegram {}'.format(text))
         TelegramSendThread(
-            options.token, options.chat_id, text, options.parse_mode
+            options.token, options.chat_id, text, options.parse_mode, options.thread_id
         ).start()