send

.deploy/deploy-dev.yaml

@@ -2,23 +2,6 @@ version: "3.4"
 
 
 services:
-
-  poll:
-    image: mathwave/sprint-repo:pizda-bot
-    command: poll
-    environment:
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
-      STAGE: "development"
-    networks:
-      - queues-development
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
   worker:
     image: mathwave/sprint-repo:pizda-bot
     command: worker
@@ -37,22 +20,6 @@ services:
         parallelism: 1
         order: start-first
 
-  mailbox:
-    image: mathwave/sprint-repo:pizda-bot
-    command: mailbox
-    environment:
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
-      STAGE: "development"
-    networks:
-      - queues-development
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
   pizda-bot-nginx:
     image: mathwave/sprint-repo:pizda-bot
     command: api

daemons/mailbox.py

@@ -1,27 +0,0 @@
-import telebot
-import os
-
-from daemons import base
-from utils import queues
-
-
-class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
-    def __init__(self):
-        super().__init__()
-        self.bot = telebot.TeleBot(os.getenv("TELEGRAM_TOKEN"))
-
-    @property
-    def queue_name(self):
-        return 'pizda_bot_mailbox'
-    
-    def execute(self):
-        self.poll()
-
-    def process(self, payload):
-        body = {
-            'chat_id': payload['chat_id'],
-            'text': payload['message'],
-        }
-        if payload['action'] == 'reply':
-            body['reply_to_message_id'] = payload['reply_to']
-        self.bot.send_message(**body)

daemons/poll.py

@@ -1,16 +0,0 @@
-import os
-import json
-import telebot
-
-from daemons import base
-from telebot import types
-from utils import queues
-
-
-class Daemon(base.BaseDaemon):
-    def execute(self):
-        bot = telebot.TeleBot(os.getenv("TELEGRAM_TOKEN"))
-        @bot.message_handler()
-        def do_action(message: types.Message):
-            queues.set_task('pizda_bot_worker', message.json, 1)
-        bot.polling()

daemons/worker.py

@@ -49,23 +49,29 @@ class Daemon(base.BaseDaemon, queues.TasksHandlerMixin):
 
     def reply(self, text: str, chat_id: int, message_id: int):
         queues.set_task(
-            'pizda_bot_mailbox', 
+            'botalka_mailbox', 
             {
-                'action': 'reply', 
+                'project': 'pizda-bot',
-                'message': text,
+                'name': 'telegram-bot',
-                'reply_to': message_id, 
+                'body': {
-                'chat_id': chat_id
+                    'message': text,
+                    'reply_to_message_id': message_id,
+                    'chat_id': chat_id,
+                }
             },
             1,
         )
 
     def send(self, text: str, chat_id: int):
         queues.set_task(
-            'pizda_bot_mailbox', 
+            'botalka_mailbox', 
             {
-                'action': 'send', 
+                'project': 'pizda-bot',
-                'message': text,
+                'name': 'telegram-bot',
-                'chat_id': chat_id
+                'body': {
+                    'message': text,
+                    'chat_id': chat_id,
+                }
             },
             1,
         )

main.py

@@ -2,15 +2,9 @@ import sys
 
 
 arg = sys.argv[-1]
-if arg == 'poll':
+if arg == 'worker':
-    from daemons import poll
-    daemon = poll.Daemon()
-elif arg == 'worker':
     from daemons import worker
     daemon = worker.Daemon()
-elif arg == 'mailbox':
-    from daemons import mailbox
-    daemon = mailbox.Daemon()
 else:
     from api import app
     app.run(host="0.0.0.0", port=1238)