Merge branch 'main' into add-totp-to-admin-panel

RoboSats · Aug 4, 2024 · 3a4ac68 · 3a4ac68
2 parents 7352195 + 6870663
commit 3a4ac68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/api/management/commands/telegram_watcher.py b/api/management/commands/telegram_watcher.py
@@ -50,16 +50,16 @@ def handle(self, *args, **options):
                 parts = message.split(" ")
                 if len(parts) < 2:
                     self.notifications.send_telegram_message(
-                        chat_id=result["message"]["from"]["id"],
-                        text='You must enable the notifications bot using the RoboSats client. Click on your "Robot robot" -> "Enable Telegram" and follow the link or scan the QR code.',
+                        result["message"]["from"]["id"],
+                        'You must enable the notifications bot using the RoboSats client. Click on your "Robot robot" -> "Enable Telegram" and follow the link or scan the QR code.',
                     )
                     continue
                 token = parts[-1]
                 robot = Robot.objects.filter(telegram_token=token).first()
                 if not robot:
                     self.notifications.send_telegram_message(
-                        chat_id=result["message"]["from"]["id"],
-                        text=f'Wops, invalid token! There is no Robot with telegram chat token "{token}"',
+                        result["message"]["from"]["id"],
+                        f'Wops, invalid token! There is no Robot with telegram chat token "{token}"',
                     )
                     continue
 

diff --git a/api/notifications.py b/api/notifications.py
@@ -37,13 +37,13 @@ def send_message(self, order, robot, title, description=""):
         if robot.telegram_enabled:
             self.send_telegram_message(robot.telegram_chat_id, title, description)
 
-    def save_message(self, order, robot, title, description):
+    def save_message(self, order, robot, title, description=""):
         """Save a message for a user"""
         Notification.objects.create(
             title=title, description=description, robot=robot, order=order
         )
 
-    def send_telegram_message(self, chat_id, title, description):
+    def send_telegram_message(self, chat_id, title, description=""):
         """sends a message to a user with telegram notifications enabled"""
 
         bot_token = config("TELEGRAM_TOKEN")