Merge pull request 'fix' (#10) from master into dev

Reviewed-on: #10

.deploy/deploy-dev.yaml

@@ -8,6 +8,9 @@ services:
     environment:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
+      STAGE: "development"
+    networks:
+      - queues-development
     deploy:
       mode: replicated
       restart_policy:
@@ -15,3 +18,7 @@ services:
       update_config:
         parallelism: 1
         order: start-first
+
+networks:
+  queues-development:
+    external: true

.deploy/deploy-prod.yaml

@@ -8,6 +8,9 @@ services:
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
+      STAGE: "production"
+    networks:
+      - queues
     deploy:
       mode: replicated
       restart_policy:
@@ -15,3 +18,7 @@ services:
       update_config:
         parallelism: 1
         order: start-first
+
+networks:
+  queues:
+    external: true

bot.py

@@ -6,6 +6,10 @@ from tools.queues import TasksHandlerMixin, set_task
 
 
 class Core(TasksHandlerMixin):
+    @property
+    def queue_name(self):
+        return 'roulette_bot_worker'
+
     def process(self, payload):
         message: Message = Message.de_json(json.dumps(payload))
         self.message = message
@@ -59,24 +63,39 @@ class Core(TasksHandlerMixin):
     def handle_state_search(self):
         self.send_message('🤖 Поиски собеседника продолжаются')
 
-    def send_message(self, text, chat_id=None, reply_markup=None, remove_keyboard=True, method='send_message', **kwargs):
+    def send_message(self, text, chat_id=None, reply_markup=None, remove_keyboard=True):
+        if not text:
+            return
         if reply_markup is None and remove_keyboard:
             reply_markup = ReplyKeyboardRemove()
         body = {
             'chat_id': chat_id or self.chat_id,
+            'text': text,
         }
-        if text:
-            body['text'] = text
         if reply_markup:
             body['reply_markup'] = reply_markup.to_json()
-        body.update(kwargs)
+        set_task(
+            'botalka_mailbox', 
+            {
+                'project': 'roulette-bot', 
+                'name': 'telegram-bot',
+                'method': 'send_message',
+                'body': body,
+            },
+            1,
+        )
+
+    def send(self, chat_id, method, **kwargs):
         set_task(
             'botalka_mailbox', 
             {
                 'project': 'roulette-bot', 
                 'name': 'telegram-bot',
                 'method': method,
-                'body': body,
+                'body': {
+                    'chat_id': chat_id,
+                    **kwargs,
+                },
             },
             1,
         )
@@ -94,15 +113,15 @@ class Core(TasksHandlerMixin):
         current_dialog = mongo.get_current_dialog(self.chat_id)
         chat_to_send = current_dialog['chat_id_2'] if current_dialog['chat_id_1'] == self.chat_id else current_dialog['chat_id_1']
         if self.message.photo:
-            self.send_message(None, chat_to_send, method='send_photo', photo=self.message.photo[-1].file_id)
+            self.send(chat_to_send, 'send_photo', photo=self.message.photo[-1].file_id)
         if self.message.sticker:
-            self.send_message(None, chat_to_send, method='send_sticker', data=self.message.sticker.file_id)
+            self.send(chat_to_send, 'send_data', data=self.message.sticker.file_id, data_type='sticker')
         if self.message.voice:
-            self.send_message(None, chat_to_send, method='send_voice', voice=self.message.voice.file_id)
+            self.send(chat_to_send, 'send_voice', voice=self.message.voice.file_id)
         if self.message.video_note:
-            self.send_message(None, chat_to_send, method='send_video_note', data=self.message.video_note.file_id)
+            self.send(chat_to_send, 'send_video_note', data=self.message.video_note.file_id)
         if self.message.animation:
-            self.send_message(None, chat_to_send, method='send_animation', animation=self.message.animation.file_id)
+            self.send(chat_to_send, 'send_animation', data=self.message.animation.file_id)
         self.send_message(self.message_text, chat_to_send)
 
     def start_new_dialog(self, chat_ids):