Merge pull request #931 from mraniki/dev

👷 CI Change

.github/mergify.yml

@@ -5,7 +5,6 @@ pull_request_rules:
         - base=main
         - base=dev
       - "status-success=👷Flow"
-      - "status-success=test"
     actions:
       merge:
         method: merge

.requirements/requirements.txt

@@ -32,7 +32,7 @@ curl-cffi==0.5.7 ; python_version >= "3.10" and python_version < "4.0"
 cytoolz==0.12.2 ; python_version >= "3.10" and python_version < "4" and implementation_name == "cpython"
 decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0"
 duckduckgo-search==3.8.5 ; python_version >= "3.10" and python_version < "4.0"
-dxsp==5.2.8 ; python_version >= "3.10" and python_version < "4.0"
+dxsp==5.2.9 ; python_version >= "3.10" and python_version < "4.0"
 dynaconf==3.2.3 ; python_version >= "3.10" and python_version < "4.0"
 eth-abi==4.2.1 ; python_version >= "3.10" and python_version < "4"
 eth-account==0.9.0 ; python_version >= "3.10" and python_version < "4"

pyproject.toml

@@ -51,8 +51,8 @@ nicegui = "^1.3.15"
 ping3 = "^4.0.4"
 talkytrend = "1.15.2"
 iamlistening = "4.2.11"
-findmyorder = "1.8.3"
-dxsp = "5.2.9"
+findmyorder = "1.8.4"
+dxsp = "5.2.10"
 cefi = "3.1.6"
 myllm = "3.1.23"
 

tt/plugins/default_plugins/cex_exchange_plugin.py

@@ -61,7 +61,7 @@ async def handle_message(self, msg):
         if not self.should_handle(msg):
             return
         logger.debug("settings.bot_ignore: {}", settings.bot_ignore)
-        if not msg.startswith(settings.bot_ignore):
+        if settings.bot_ignore not in msg or settings.bot_prefix not in msg:
             if await self.fmo.search(msg):
                 order = await self.fmo.get_order(msg)
                 if order and settings.trading_enabled:

tt/plugins/default_plugins/dex_exchange_plugin.py

@@ -52,7 +52,7 @@ async def handle_message(self, msg):
         if not self.should_handle(msg):
             return
 
-        if not msg.startswith(settings.bot_ignore):
+        if settings.bot_ignore not in msg or settings.bot_prefix not in msg:
             if await self.fmo.search(msg):
                 order = await self.fmo.get_order(msg)
                 if order and settings.trading_enabled:

tt/plugins/default_plugins/llm_plugin.py

@@ -37,10 +37,8 @@ async def handle_message(self, msg):
         """Handles incoming messages"""
         if not self.should_handle(msg):
             return
-        if (
-            self.llm.llm_ai_mode
-            and not msg.startswith(settings.llm_prefix)
-            and not msg.startswith(settings.bot_prefix)
+        if self.llm.llm_ai_mode and (
+            settings.bot_ignore not in msg or settings.bot_prefix not in msg
         ):
             chat = await self.llm.chat(str(msg))
             await self.send_notification(chat)