Merge pull request #1434 from mraniki/dev

⚡ update cex_exchange_plugin.py and dex_exchange_plugin.py

pyproject.toml

@@ -55,8 +55,8 @@ ping3 = "^4.0.4"
 talkytrend = "2.0.8"
 iamlistening = "5.1.5"
 findmyorder = "1.9.19"
-dxsp = "10.0.1"
-cefi = "4.4.11"
+dxsp = "10.0.2"
+cefi = "4.4.12"
 myllm = "4.8.1"
 
 

tt/plugins/default_plugins/cex_exchange_plugin.py

@@ -52,14 +52,13 @@ async def handle_message(self, msg):
         """
         if not self.should_handle(msg):
             return
-        if (settings.bot_ignore not in msg or settings.bot_prefix not in msg) and (
-            await self.fmo.search(msg) and self.should_handle_timeframe()
-        ):
-            order = await self.fmo.get_order(msg)
-            if order and settings.trading_enabled:
-                trade = await self.exchange.submit_order(order)
-                if trade:
-                    await send_notification(trade)
+        if settings.bot_ignore not in msg or settings.bot_prefix not in msg:
+            if await self.fmo.search(msg) and self.should_handle_timeframe():
+                order = await self.fmo.get_order(msg)
+                if order and settings.trading_enabled:
+                    trade = await self.exchange.submit_order(order)
+                    if trade:
+                        await send_notification(trade)
 
         if msg.startswith(settings.bot_prefix):
             command, *args = msg.split(" ")

tt/plugins/default_plugins/dex_exchange_plugin.py

@@ -45,14 +45,13 @@ async def handle_message(self, msg):
         if not self.should_handle(msg):
             return
 
-        if (settings.bot_ignore not in msg or settings.bot_prefix not in msg) and (
-            await self.fmo.search(msg) and self.should_handle_timeframe()
-        ):
-            order = await self.fmo.get_order(msg)
-            if order and settings.trading_enabled:
-                trade = await self.exchange.submit_order(order)
-                if trade:
-                    await send_notification(trade)
+        if settings.bot_ignore not in msg or settings.bot_prefix not in msg:
+            if await self.fmo.search(msg) and self.should_handle_timeframe():
+                order = await self.fmo.get_order(msg)
+                if order and settings.trading_enabled:
+                    trade = await self.exchange.submit_order(order)
+                    if trade:
+                        await send_notification(trade)
 
         if msg.startswith(settings.bot_prefix):
             command, *args = msg.split(" ")

tt/talky_settings.toml

@@ -108,7 +108,7 @@ iamlistening_enabled = true
 # Bot Prefix 
 bot_prefix = "/"
 # Character to ignore
-bot_ignore = "ℹ️ 🦄 ⚠️ 📊 🏦 📺 ⬆️ 💬 🐻"
+bot_ignore = "ℹ️ ⚠️ 📊 🏦 📺 ⬆️ 💬 🐻"
 # Command for help
 bot_command_help = "help"
 # Command for info

tt/utils.py

@@ -48,12 +48,15 @@ async def send_notification(msg):
     if not settings.apprise_url:
         logger.warning("No Apprise URL set")
         return
+    if msg is None:
+        logger.warning("No message to send")
+        return
     aobj = Apprise(settings.apprise_url)
     msg_format = settings.apprise_format or NotifyFormat.MARKDOWN
     try:
         await aobj.async_notify(body=msg, body_format=msg_format)
     except Exception as error:
-        logger.error("Verify Apprise URL: ", error)
+        logger.error("Verify Apprise URL", error)
 
 
 async def run_bot():